From 6855d3ee03d3228851edaf14d1830bdefc544c30 Mon Sep 17 00:00:00 2001 From: 0xz00n <0xz00n@gmail.com> Date: Sun, 9 Feb 2020 16:06:19 -0600 Subject: [PATCH] It loads and shuts down cleanly in python3 now --- SpanshRouter/AutoCompleter.py | 6 +++--- load.py | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SpanshRouter/AutoCompleter.py b/SpanshRouter/AutoCompleter.py index 7a14445..feeedb8 100755 --- a/SpanshRouter/AutoCompleter.py +++ b/SpanshRouter/AutoCompleter.py @@ -20,7 +20,7 @@ is_py2 = sys.version[0] == '2' if is_py2: import Queue as queue else: - import queue as queue + import queue class AutoCompleter(Entry, PlaceHolder): @@ -34,7 +34,7 @@ class AutoCompleter(Entry, PlaceHolder): self.lb = Listbox(self.parent, selectmode=SINGLE, **kw) self.lb_up = False self.has_selected = False - self.queue = Queue.Queue() + self.queue = queue.Queue() PlaceHolder.__init__(self, placeholder) @@ -187,7 +187,7 @@ class AutoCompleter(Entry, PlaceHolder): lista = self.queue.get_nowait() self.show_results(lista) self.update_idletasks() - except Queue.Empty: + except queue.Empty: pass self.after(100, self.update_me) diff --git a/load.py b/load.py index 2dd9638..2481a46 100644 --- a/load.py +++ b/load.py @@ -5,12 +5,12 @@ if is_py2: else: from SpanshRouter.SpanshRouter import SpanshRouter -global spansh_router -spansh_router = None -plugin_dir = None - def plugin_start3(plugin_dir): - return plugin_start(plugin_dir) + global spansh_router + spansh_router = SpanshRouter(plugin_dir) + #spansh_router.check_for_update() + spansh_router.open_last_route() + return 'spansh_router' def plugin_start(plugin_dir): # Check for newer versions