From 70e28aa9a7bea4ae60ffae25f0ffc0ed6e1263ed Mon Sep 17 00:00:00 2001
From: Elite-IGAU <elite.igau@gmail.com>
Date: Sun, 9 Feb 2020 11:44:48 -0700
Subject: [PATCH] Python 3 updates

---
 SpanshRouter/AutoCompleter.py    | 21 +++++++++++++++++----
 SpanshRouter/PlaceHolder.py      |  8 +++++++-
 SpanshRouter/PlaceHolderEntry.py | 11 ++++++++---
 SpanshRouter/SpanshRouter.py     | 18 +++++++++++++-----
 SpanshRouter/updater.py          |  2 --
 load.py                          |  6 +++++-
 6 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/SpanshRouter/AutoCompleter.py b/SpanshRouter/AutoCompleter.py
index 0a3dacb..206fd84 100755
--- a/SpanshRouter/AutoCompleter.py
+++ b/SpanshRouter/AutoCompleter.py
@@ -1,14 +1,27 @@
-#!/usr/bin/env python2
-
 import threading
-import Queue
 import json
 import os
 import requests
 import traceback
-from Tkinter import *
 from time import sleep
 from PlaceHolder import PlaceHolder
+import sys
+
+try:
+    # Python 2
+    from Tkinter import *
+    import ttk   
+except ModuleNotFoundError:
+    # Python 3
+    import tkinter as tk
+    from tkinter import *
+    
+is_py2 = sys.version[0] == '2'
+if is_py2:
+    import Queue as queue
+else:
+    import queue as queue
+    
 
 class AutoCompleter(Entry, PlaceHolder):
     def __init__(self, parent, placeholder, **kw):
diff --git a/SpanshRouter/PlaceHolder.py b/SpanshRouter/PlaceHolder.py
index a0ff542..380d973 100644
--- a/SpanshRouter/PlaceHolder.py
+++ b/SpanshRouter/PlaceHolder.py
@@ -1,5 +1,11 @@
 from config import config
-from Tkinter import END
+try:
+    # Python 2
+    from Tkinter import END
+except ModuleNotFoundError:
+    # Python 3
+    import tkinter as tk
+    from tkinter import *
 
 class PlaceHolder():
     def __init__(self, placeholder, **kw):
diff --git a/SpanshRouter/PlaceHolderEntry.py b/SpanshRouter/PlaceHolderEntry.py
index 8fd1bc3..ad28031 100644
--- a/SpanshRouter/PlaceHolderEntry.py
+++ b/SpanshRouter/PlaceHolderEntry.py
@@ -1,8 +1,13 @@
-#!/usr/bin/env python2
-
-from Tkinter import *
 from PlaceHolder import PlaceHolder
 
+try:
+    # Python 2
+    from Tkinter import *
+except ModuleNotFoundError:
+    # Python 3
+    import tkinter as tk
+    from tkinter import *
+
 class PlaceHolderEntry(Entry, PlaceHolder):
     def __init__(self, parent, placeholder, **kw):
         Entry.__init__(self, parent, **kw)
diff --git a/SpanshRouter/SpanshRouter.py b/SpanshRouter/SpanshRouter.py
index 5ef75b8..57b676a 100755
--- a/SpanshRouter/SpanshRouter.py
+++ b/SpanshRouter/SpanshRouter.py
@@ -1,5 +1,3 @@
-#! /usr/bin/env python2
-
 import os
 import sys
 import traceback
@@ -9,15 +7,25 @@ import webbrowser
 import json
 import re
 import requests
-import Tkinter as tk
-import tkFileDialog as filedialog
-import tkMessageBox as confirmDialog
 from time import sleep
 from monitor import monitor
 from . import AutoCompleter
 from . import PlaceHolderEntry
 from .updater import SpanshUpdater
 
+try:
+    # Python 2
+    from Tkinter import *
+    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
+
 class SpanshRouter():
     def __init__(self, plugin_dir):
         version_file = os.path.join(plugin_dir, "version.json")
diff --git a/SpanshRouter/updater.py b/SpanshRouter/updater.py
index 535f9cd..9388e7d 100755
--- a/SpanshRouter/updater.py
+++ b/SpanshRouter/updater.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python2
-
 import os
 import requests
 import zipfile
diff --git a/load.py b/load.py
index a22a92d..4fea594 100644
--- a/load.py
+++ b/load.py
@@ -2,12 +2,16 @@ from SpanshRouter import SpanshRouter
 
 spansh_router = None
 
-def plugin_start(plugin_dir):
+def plugin_start3(plugin_dir):
+    return plugin_start()
+
+def plugin_start():
     # Check for newer versions
     global spansh_router
     spansh_router = SpanshRouter(plugin_dir)
     spansh_router.check_for_update()
     spansh_router.open_last_route()
+    return 'spansh_router'
 
 def plugin_stop():
     global spansh_router