Merge pull request #2 from 0xz00n/master

It loads and shuts down cleanly in python3 now
This commit is contained in:
0xz00n 2020-02-09 16:19:43 -06:00 committed by GitHub
commit eb38da8ea9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View File

@ -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)

10
load.py
View File

@ -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