Support new Python3 EDMC

load.py

@@ -4,7 +4,7 @@
 import os
 import traceback
 import requests
-import Tkinter as tk
+import tkinter as tk
 try:
     import myNotebook as nb
     from config import config
@@ -19,7 +19,7 @@
 LOG = LogContext()
 LOG.set_filename(os.path.join(os.path.abspath(os.path.dirname(__file__)), "plugin.log"))
 
-HITS_VERSION = "1.1.0"
+HITS_VERSION = "1.1.2"
 EDSM_SERVER = "https://www.edsm.net"
 DEFAULT_OVERLAY_MESSAGE_DURATION = 4
 
@@ -39,6 +39,10 @@ def get_display_ttl():
         return DEFAULT_OVERLAY_MESSAGE_DURATION
 
 
+def plugin_start3(plugindir):
+    plugin_start()
+
+
 def plugin_start():
     """
     Start up our EDMC Plugin
@@ -114,7 +118,7 @@ def info(line1, line2=None, line3=None):
         display(line3, row=DETAIL3, col=95, size="normal")
 
 
-def plugin_prefs(parent):
+def plugin_prefs(parent, cmdr, isbeta):
     frame = nb.Frame(parent)
     frame.columnconfigure(1, weight=1)
 
@@ -129,7 +133,7 @@ def plugin_prefs(parent):
     return frame
 
 
-def prefs_changed():
+def prefs_changed(cmdr, isbeta):
     config.set(PREFNAME_OVERLAY_DURATION, OVERLAY_MESSAGE_DURATION.get())
     config.set(OVERLAY_HITS_MODE, OVERLAY_HITS_MODE.get())
 
@@ -138,7 +142,7 @@ def prefs_changed():
 CURRENT_CMDR = None
 
 
-def journal_entry(cmdr, system, station, entry, state):
+def journal_entry(cmdr, isbeta, system, station, entry, state):
     """
     Check a system for advice
     :param cmdr:
@@ -227,9 +231,9 @@ def _check_location(system):
     except Exception as err:
         info(None, line3="Error.. {} {}".format(type(err), err.message))
         LOG.write(traceback.format_exc())
-        print type(err)
-        print err.message
-        print traceback.format_exc()
+        print(type(err))
+        print(err.message)
+        print(traceback.format_exc())
 
 
 def check_location(system):

logger.py

@@ -37,8 +37,8 @@ def rotate_log(self):
                     os.unlink(moved)
                 if os.path.exists(filename):
                     os.rename(filename, moved)
-            except:
-                print traceback.format_exc()
+            except Exception as err:
+                print("rotate_log failed..: {}".format(err))
 
             self.write("Log rotated to {}".format(moved))
 
@@ -57,8 +57,8 @@ def write(self, message):
                     logfile.write(timestamp + " ")
                     logfile.write(message)
                     logfile.write("\n")
-            except:
-                print traceback.format_exc()
+            except Exception as err:
+                print(str(err))
 
         if self.count > self.maxwrite:
             self.rotate_log()

worker.py

@@ -1,7 +1,7 @@
 """
 Thread pool system
 """
-from Queue import Queue
+from queue import Queue
 from threading import Thread
 import traceback
 
@@ -81,5 +81,6 @@ def run(self):
             if task:
                 try:
                     task.target(*task.args, **task.kwargs)
-                except Exception:
+                except Exception as err:
+                    print("error: logging exception " + str(err))
                     self.pool.logger.write(traceback.format_exc())