Cleanup Python2/3 compatibility

README.md

@@ -37,7 +37,7 @@ Fly dangerous! o7
 
 ## Updates
 
-When a new update is available, it will automatically be downloaded. You'll just have to restart EDMC to install it.
+When a new update is available, you will be prompted with a popup listing the last changes, and asking whether you wish to update or not. If you say yes, the update will be installed the next time you launch EDMC.
 
 ## Known Issues
 

SpanshRouter/AutoCompleter.py

@@ -5,23 +5,9 @@ import requests
 import traceback
 from time import sleep
 import sys
-
-try:
-    # Python 2
-    from Tkinter import *
-    import ttk
-    from .PlaceHolder import PlaceHolder
-except ModuleNotFoundError:
-    # Python 3
-    import tkinter as tk
-    from tkinter import *
-    from SpanshRouter.PlaceHolder import PlaceHolder
-    
-is_py2 = sys.version[0] == '2'
-if is_py2:
-    import Queue as queue
-else:
-    import queue 
+from tkinter import *
+from SpanshRouter.PlaceHolder import PlaceHolder
+import queue 
     
 
 class AutoCompleter(Entry, PlaceHolder):
@@ -88,7 +74,7 @@ class AutoCompleter(Entry, PlaceHolder):
     def select_all(self, event):
         event.widget.event_generate('<<SelectAll>>')
 
-    def changed(self, name, index, mode):
+    def changed(self, name=None, index=None, mode=None):
         self.set_default_style()
         value = self.var.get()
         if value.__len__() < 3 and self.lb_up or self.has_selected:
@@ -133,7 +119,7 @@ class AutoCompleter(Entry, PlaceHolder):
             if widget != "listbox":
                 self.lb.activate(index)
         else:
-            self.query_systems()
+            self.changed()
 
     def show_results(self, results):
         if results:

SpanshRouter/PlaceHolder.py

@@ -1,11 +1,5 @@
 from config import config
-try:
-    # Python 2
-    from Tkinter import END
-except ModuleNotFoundError:
-    # Python 3
-    import tkinter as tk
-    from tkinter import *
+from tkinter import END
 
 class PlaceHolder():
     def __init__(self, placeholder, **kw):

SpanshRouter/SpanshRouter.py

@@ -13,20 +13,20 @@ from monitor import monitor
 from . import AutoCompleter
 from . import PlaceHolderEntry
 from .updater import SpanshUpdater
+import tkinter as tk
+# from tkinter import *
+import tkinter.filedialog as filedialog
+import tkinter.messagebox as confirmDialog
 
-try:
-    # Python 2
-    from Tkinter import *
-    import Tkinter as tk
-    import tkFileDialog as filedialog
-    import tkMessageBox as confirmDialog
-    import ttk
-except ModuleNotFoundError:
-    # Python 3
-    import tkinter as tk
-    from tkinter import *
-    import tkinter.filedialog as filedialog
-    import tkinter.messagebox as confirmDialog
+# try:
+#     # Python 2
+#     from Tkinter import *
+#     import Tkinter as tk
+#     import tkFileDialog as filedialog
+#     import tkMessageBox as confirmDialog
+#     import ttk
+# except ModuleNotFoundError:
+#     # Python 3
 
 class SpanshRouter():
     def __init__(self, plugin_dir):

SpanshRouter/__init__.py

@@ -1,14 +1,6 @@
 import sys
 import traceback
-try:
-    # Python 2
-    from .updater import SpanshUpdater
-    from .AutoCompleter import AutoCompleter
-    from .PlaceHolderEntry import PlaceHolderEntry
-    from SpanshRouter import SpanshRouter
-except ModuleNotFoundError:
-    # Python 3
-    from SpanshRouter.updater import SpanshUpdater
-    from SpanshRouter.AutoCompleter import AutoCompleter
-    from SpanshRouter.PlaceHolderEntry import PlaceHolderEntry
-    from SpanshRouter import SpanshRouter
+from SpanshRouter.updater import SpanshUpdater
+from SpanshRouter.AutoCompleter import AutoCompleter
+from SpanshRouter.PlaceHolderEntry import PlaceHolderEntry
+from SpanshRouter import SpanshRouter

load.py

@@ -1,19 +1,11 @@
 import sys
-is_py2 = sys.version[0] == '2'
-if is_py2:
-    from SpanshRouter import SpanshRouter
-    import tkMessageBox as confirmDialog
-else:
-    from SpanshRouter.SpanshRouter import SpanshRouter
-    import tkinter.messagebox as confirmDialog
+from SpanshRouter.SpanshRouter import SpanshRouter
+import tkinter.messagebox as confirmDialog
 
 spansh_router = None
 
 def plugin_start3(plugin_dir):
-    global spansh_router
-    spansh_router = SpanshRouter(plugin_dir)
-    spansh_router.check_for_update()
-    return 'spansh_router'
+    return plugin_start(plugin_dir)
 
 def plugin_start(plugin_dir):
     global spansh_router