tradedangerous 10.16.17__py3-none-any.whl → 11.0.0__py3-none-any.whl

tradedangerous/plugins/journal_plug.py

@@ -20,7 +20,7 @@ def snapToGrid32(val):
 def getYNfromService(obj, key):
     return "Y" if key in obj else "N"
 
-class JournalStation(object):
+class JournalStation:
     __slots__ = (
         'lsFromStar', 'blackMarket', 'maxPadSize',
         'market', 'shipyard', 'outfitting',
@@ -303,6 +303,7 @@ class ImportPlugin(ImportPluginBase):
         if not optShow:
             try:
                 idJournal = tdb.lookupAdded(self.ADDED_NAME)
+                tdenv.DEBUG1("idjournal = {}", idJournal)
             except KeyError:
                 tdenv.WARN("Entry '{}' not found in 'Added' table.", self.ADDED_NAME)
                 tdenv.WARN("Trying to add it myself.")

tradedangerous/plugins/netlog_plug.py

@@ -3,16 +3,15 @@ import os
 import re
 import pathlib
 import time as _time
-from datetime import datetime, time, timedelta, timezone
+from datetime import datetime, timedelta, timezone
 
-from .. import tradedb, tradeenv, csvexport
+from .. import csvexport
 from . import PluginException, ImportPluginBase
 
 def snapToGrid32(val):
     try:
         val = float(val)
-        if val < 0: corr = -0.5
-        else:       corr = +0.5
+        corr = -0.5 if val < 0 else +0.5
         pos = int(val*32+corr)/32
     except:
         pos = None
@@ -138,7 +137,7 @@ class ImportPlugin(ImportPluginBase):
                                 pass
                         if not headDate:
                             if lineCount > 3:
-                               raise PluginException("Doesn't seem do be a FDEV netLog file")
+                                raise PluginException("Doesn't seem do be a FDEV netLog file")
                         else:
                             statHeader = False
                             if lineCount == 3:
@@ -184,6 +183,7 @@ class ImportPlugin(ImportPluginBase):
         if not optShow:
             try:
                 idNetLog = tdb.lookupAdded(self.ADDED_NAME)
+                tdenv.DEBUG1("idNetLog = {}", idNetLog)
             except KeyError:
                 tdenv.WARN("Entry '{}' not found in 'Added' table.", self.ADDED_NAME)
                 tdenv.WARN("Trying to add it myself.")