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

tradedangerous/mfd/saitek/directoutput.py

@@ -60,8 +60,6 @@ DirectOutput_CloseServer
 
 """
 
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-
 from tradedangerous.mfd import MissingDeviceError
 
 import ctypes
@@ -69,6 +67,8 @@ import ctypes.wintypes
 import logging
 import os
 import platform
+import sys
+import time
 
 S_OK = 0x00000000
 E_HANDLE = 0x80070006
@@ -84,8 +84,7 @@ SOFTBUTTON_UP = 0x00000002
 SOFTBUTTON_DOWN = 0x00000004
 
 
-class DirectOutput(object):
-    
+class DirectOutput:
     def __init__(self, dll_path):
         """
         Creates python object to interact with DirecOutput.dll
@@ -165,7 +164,7 @@ class DirectOutput(object):
         S_OK: The call completed successfully.
         E_HANDLE: The device handle specified is invalid.
         """
-
+        
         logging.debug("DirectOutput.RegisterSoftButtonCallback({}, {})".format(device_handle, function))
         return self.DirectOutputDLL.DirectOutput_RegisterSoftButtonCallback(ctypes.wintypes.HANDLE(device_handle), function, 0)
     
@@ -276,9 +275,9 @@ class DirectOutput(object):
         return self.DirectOutputDLL.DirectOutput_SetString(ctypes.wintypes.HANDLE(device_handle), page, line, len(string), ctypes.wintypes.LPWSTR(string))
 
 
-class DirectOutputDevice(object):
+class DirectOutputDevice:
     
-    class Buttons(object):
+    class Buttons:
         
         select, up, down = False, False, False
         
@@ -658,8 +657,6 @@ if __name__ == '__main__':
     # logging.basicConfig(level=logging.INFO, format='%(asctime)s %(name)s [%(filename)s:%(lineno)d] %(message)s')
     logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(name)s [%(filename)s:%(lineno)d] %(message)s')
     
-    import time, sys
-    
     device = DirectOutputDevice(debug_level=1)
     print("Device initialized")
     
@@ -675,7 +672,7 @@ if __name__ == '__main__':
     while True:
         try:
             time.sleep(1)
-        except:
-            #This is used to catch Ctrl+C, calling finish method is *very* important to de-initalize device.
+        except:  # noqa: E722
+            # This is used to catch Ctrl+C, calling finish method is *very* important to de-initalize device.
             device.finish()
             sys.exit()

tradedangerous/mfd/saitek/x52pro.py

@@ -13,13 +13,14 @@ TODO:
     * Error handling and exceptions
 """
 
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-
 from tradedangerous.mfd.saitek.directoutput import DirectOutputDevice
 
+import sys
+import time
+
 
 class X52Pro(DirectOutputDevice):
-    class Page(object):
+    class Page:
         _lines = [ str(), str(), str() ]
         _leds  = dict()
         
@@ -45,7 +46,7 @@ class X52Pro(DirectOutputDevice):
                 self.device.SetString(self.page_id, key, value)
         
         def activate(self):
-            if self.active == True:
+            if self.active is True:
                 return
             self.device.AddPage(self.page_id, self.name, 1)
         
@@ -172,8 +173,6 @@ if __name__ == '__main__':
     
     print("Looping")
     
-    import time, sys
-    
     loopNo = 0
     while True:
         try:
@@ -194,4 +193,3 @@ if __name__ == '__main__':
             print(e)
             x52.finish()
             sys.exit()
-

tradedangerous/misc/checkpricebounds.py

@@ -143,7 +143,7 @@ def check_price_bounds(
     if stations:
         print()
         print("Generating", deletePrices)
-        now = tdb.query("SELECT CURRENT_TIMESTAMP").fetchone()[0];
+        now = tdb.query("SELECT CURRENT_TIMESTAMP").fetchone()[0]
         with open(deletePrices, "w", encoding="utf-8") as fh:
             print("# Deletions based on {} prices".format(
                 table,
@@ -175,8 +175,6 @@ def check_price_bounds(
                 db.commit()
 
 def main():
-    doDeletions = False
-    
     parser = argparse.ArgumentParser(
         description='Check for prices that are outside reasonable bounds.'
     )
@@ -284,5 +282,6 @@ def main():
         errorFilter=errorFilter,
     )
 
+
 if __name__ == "__main__":
     main()

tradedangerous/misc/clipboard.py

@@ -8,7 +8,7 @@ if 'NOTK' not in os.environ:
     try:
         from tkinter import Tk
         
-        class SystemNameClip(object):
+        class SystemNameClip:
             """
             A cross-platform wrapper for copying system names into
             the clipboard such that they can be pasted into the E:D
@@ -41,10 +41,9 @@ if 'NOTK' not in os.environ:
                 "Set the environment variable 'NOTK' to disable this warning."
         )
         
-        class SystemNameClip(object):
+        class SystemNameClip:
             """
             Dummy implementation when tkinter is not available.
             """
             def copy_text(self, text):
                 pass
-

tradedangerous/misc/coord64.py

@@ -17,12 +17,13 @@
 # Original Author: Oliver "kfsone" Smith <oliver@kfs.org>
 # Released under the "use it with attribution" license.
 
-from __future__ import print_function, division
 import string
 
+
 alphabet = string.digits + string.ascii_lowercase + string.ascii_uppercase + '_.'
 precision = 100.
 
+
 def coord_to_d64(coord):
     i = int(abs(coord * precision))
     

tradedangerous/misc/derp-sentinel.py

@@ -28,8 +28,8 @@ def mutate(text, pos):
             yield t2
             yield from mutate(str(t2), i+len(mutant))
 
+
 for name in names:
     for mutant in mutate(name, 0):
         if mutant in names:
             print("{} <-> {}".format(name, mutant))
-

tradedangerous/misc/diff-system-csvs.py

@@ -29,8 +29,10 @@ class Loc(namedtuple('Loc', [ 'x', 'y', 'z' ])):
 class Item(namedtuple('Item', [ 'norm', 'name', 'loc' ])):
     pass
 
+
 normalizeRe = re.compile('[^A-Za-z0-9\' ]')
 
+
 def readFile(filename):
     path = Path(filename)
     if not path.exists():
@@ -71,6 +73,7 @@ def readFile(filename):
     
     return names, locs
 
+
 oldNames, oldLocs = readFile(sys.argv[1])
 newNames, newLocs = readFile(sys.argv[2])
 

tradedangerous/misc/eddb.py

@@ -11,8 +11,6 @@ Example:
 Original author: oliver@kfs.org
 """
 
-import json
-import sys
 import transfers
 
 BASE_URL = "http://eddb.io/archive/v3/"
@@ -22,7 +20,7 @@ STATIONS_EXT_JSON = BASE_URL + "stations.json"
 STATIONS_LITE_JSON = BASE_URL + "stations_lite.json"
 
 
-class EDDBQuery(object):
+class EDDBQuery:
     """
     Base class for querying an EDDB data set and converting the
     JSON results into an iterable stream.

tradedangerous/misc/eddn.py

@@ -86,12 +86,12 @@ class MarketPrice(namedtuple('MarketPrice', [
     pass
 
 
-class Listener(object):
+class Listener:
     """
     Provides an object that will listen to the Elite Dangerous Data Network
     firehose and capture messages for later consumption.
     
-    Rather than individual upates, prices are captured across a window of
+    Rather than individual updates, prices are captured across a window of
     between minBatchTime and maxBatchTime. When a new update is received,
     Rather than returning individual messages, messages are captured across
     a window of potentially several seconds and returned to the caller in

tradedangerous/misc/edsc.py

@@ -1,17 +1,9 @@
 #! /usr/bin/env python3
 
-from __future__ import absolute_import
-from __future__ import with_statement
-from __future__ import print_function
-from __future__ import division
-from __future__ import unicode_literals
-
-from collections import defaultdict, namedtuple
-from urllib.parse import urlencode
+from collections import namedtuple
 from urllib.request import Request, urlopen
 
 import json
-import os
 
 try:
     import requests
@@ -45,7 +37,7 @@ def edsc_log(apiCall, params, jsonData=None, error=None):
         pass
 
 
-class EDSCQueryBase(object):
+class EDSCQueryBase:
     """
     Base class for creating an EDSC Query class, do not use directly.
     
@@ -116,7 +108,7 @@ class Status(namedtuple('Status', [
         ])):
     pass
 
-class StarSubmissionResult(object):
+class StarSubmissionResult:
     """
     Translates a response the json we get back from EDSC when
     we submit a StarSubmission into something less awful to
@@ -228,7 +220,7 @@ class StarSubmissionResult(object):
             code = int(ent['status']['statusnum'])
             msg = ent['status']['msg']
             if code in [301, 302, 303, 304]:
-                if not lhsName in self.distances:
+                if lhsName not in self.distances:
                     self.distances[lhsName] = {}
                 try:
                     rhsDists = self.distances[rhsName]
@@ -238,7 +230,7 @@ class StarSubmissionResult(object):
                     pass
                 dist = float(ent['dist'])
                 self.distances[lhsName][rhsName] = dist
-                if not lhsName in self.systems:
+                if lhsName not in self.systems:
                     self.systems[lhsName] = (code, None)
             else:
                 if (lhsName,rhsName,code) in errPairs:
@@ -335,7 +327,7 @@ class StarSubmissionResult(object):
 
 
 
-class StarSubmission(object):
+class StarSubmission:
     baseURL = "http://edstarcoordinator.com/api.asmx/"
     apiCall = "SubmitDistances"
     
@@ -431,6 +423,7 @@ class StarSubmission(object):
         
         return innerData
 
+
 if __name__ == "__main__":
     print("Requesting recent, non-test, coords-known, cr >= 2 stars")
     edsq = StarQuery(test=False, confidence=2, known=1)

tradedangerous/misc/edsm.py

@@ -5,14 +5,7 @@ based on edsc.py
 uses EDSM - https://www.edsm.net/api
 """
 
-from __future__ import absolute_import
-from __future__ import with_statement
-from __future__ import print_function
-from __future__ import division
-from __future__ import unicode_literals
-
 import json
-import os
 
 try:
     import requests
@@ -47,7 +40,7 @@ def edsm_log(apiCall, url, params, jsonData=None, error=None):
         pass
 
 
-class EDSMQueryBase(object):
+class EDSMQueryBase:
     """
     Base class for creating an EDSM Query class, do not use directly.
     

tradedangerous/misc/importeddbstats.py

@@ -24,6 +24,7 @@ def matching_stations():
         if tdStn:
             yield tdStn, eddbStn
 
+
 updateStation = tdb.updateLocalStation
 
 bool_trans = { None: '?', 0: 'N', 1: 'Y' }
@@ -50,4 +51,4 @@ for tdStn, eddbStn in matching_stations():
 if updates:
     tdb.getDB().commit()
     csvexport.exportTableToFile(tdb, tdb.tdenv, "Station")
-    print("Updated Station.csv: {} updates".format(updates))
+    print("Updated Station.csv: {} updates".format(updates))

tradedangerous/misc/prices-json-exp.py

@@ -2,19 +2,21 @@
 
 # Experimental module to generate a JSON version of the .prices file.
 
-# Set to True to allow export of systems that don't have any station data
-emptySystems = True
-# Set to True to allow export of stations that don't have prices
-emptyStations = True
-
 import sqlite3
 import json
 import time
 import collections
 import os
 
+
+# Set to True to allow export of systems that don't have any station data
+emptySystems = True
+# Set to True to allow export of stations that don't have prices
+emptyStations = True
+
 conn = sqlite3.connect("data/TradeDangerous.db")
 
+
 def collectItemData(db):
     """
     Builds a flat, array of item names that serves as a table of items.

tradedangerous/misc/progress.py

@@ -1,6 +1,6 @@
 import sys
 
-class Progress(object):
+class Progress:
     """
     Helper class that describes a simple text-based progress bar.
     """
@@ -68,4 +68,4 @@ class Progress(object):
         if self.textLen:
             fin = "\r{:{width}}\r".format('', width=self.textLen)
             sys.stdout.write(fin)
-            sys.stdout.flush()
+            sys.stdout.flush()

tradedangerous/plugins/__init__.py

@@ -10,7 +10,7 @@ class PluginException(Exception):
     """
 
 
-class PluginBase(object):
+class PluginBase:
     """
     Base class for plugin implementation.
     
@@ -49,7 +49,7 @@ class PluginBase(object):
             else:
                 key, value = opt[:equals], opt[equals+1:]
             keyName = key.lower()
-            if not keyName in pluginOptions:
+            if keyName not in pluginOptions:
                 if keyName == "help":
                     raise SystemExit(self.usage())
                 

tradedangerous/plugins/edapi_plug.py

@@ -61,8 +61,7 @@ class OAuthCallbackHandler(BaseHTTPRequestHandler):
         pass
 
 
-class OAuthCallbackServer(object):
-    
+class OAuthCallbackServer:
     def __init__(self, hostname, port, handler):
         myServer = HTTPServer
         myServer.callback_code = None
@@ -136,8 +135,11 @@ class EDAPI:
         # Grab the commander profile
         self.text = []
         self.profile = self.query_capi("/profile")
-        market = self.query_capi("/market")
-        shipyard = self.query_capi("/shipyard")
+        
+        # kfsone: not sure if there was a reason to query these even tho we didn't
+        # use the resulting data.
+        # market = self.query_capi("/market")
+        # shipyard = self.query_capi("/shipyard")
         
         # Grab the market, outfitting and shipyard data if needed
         portServices = self.profile['lastStarport'].get('services')
@@ -503,7 +505,8 @@ class ImportPlugin(plugins.ImportPluginBase):
         
         def warnAPIResponse(checkName, checkYN):
             # no warning if unknown
-            if checkYN == "?": return False
+            if checkYN == "?":
+                return False
             warnText = (
                 "The station should{s} have a {what}, "
                 "but the API did{d} return one."
@@ -582,7 +585,7 @@ class ImportPlugin(plugins.ImportPluginBase):
             tdenv.WARN("(Fields will be marked with an leading asterisk '*')")
             askForData = True
         if ((defStation.lsFromStar == 0) or ("?" in defStation)):
-           askForData = True
+            askForData = True
         
         newStation = {}
         for key in defStation._fields:
@@ -812,9 +815,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         shipCost = {}
         shipList = []
         eddn_ships = []
-        if ((station.shipyard == "Y") and
-            ('ships' in api.profile['lastStarport'])
-        ):
+        if ((station.shipyard == "Y") and ('ships' in api.profile['lastStarport'])):
             if 'shipyard_list' in api.profile['lastStarport']['ships']:
                 if len(api.profile['lastStarport']['ships']['shipyard_list']):
                     for ship in api.profile['lastStarport']['ships']['shipyard_list'].values():
@@ -914,9 +915,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         # If a market exists, make the item lists
         itemList = []
         eddn_market = []
-        if ((station.market == "Y") and
-            ('commodities' in api.profile['lastStarport'])
-        ):
+        if ((station.market == "Y") and ('commodities' in api.profile['lastStarport'])):
             for commodity in api.profile['lastStarport']['commodities']:
                 if commodity['categoryname'] in cat_ignore:
                     continue
@@ -1046,18 +1045,13 @@ class ImportPlugin(plugins.ImportPluginBase):
                     eddn_ships
                 )
             
-            if ((station.outfitting == "Y") and
-                ('modules' in api.profile['lastStarport'] and
-                len(api.profile['lastStarport']['modules']))
-            ):
+            if station.outfitting == "Y" and 'modules' in api.profile['lastStarport'] and len(api.profile['lastStarport']['modules']):
                 eddn_modules = []
                 for module in api.profile['lastStarport']['modules'].values():
                     # see: https://github.com/EDSM-NET/EDDN/wiki
                     addModule = False
                     if module['name'].startswith(('Hpt_', 'Int_')) or module['name'].find('_Armour_') > 0:
-                        if module.get('sku', None) in (
-                            None, 'ELITE_HORIZONS_V_PLANETARY_LANDINGS'
-                        ):
+                        if module.get('sku', None) in (None, 'ELITE_HORIZONS_V_PLANETARY_LANDINGS'):
                             if module['name'] != 'Int_PlanetApproachSuite':
                                 addModule = True
                     if addModule:

tradedangerous/plugins/edcd_plug.py

@@ -1,8 +1,7 @@
 import csv
 import pathlib
-import random
 
-from .. import cache, tradeenv, transfers, csvexport
+from .. import cache, transfers, csvexport
 from ..tradedb import Category, Item
 from . import PluginException, ImportPluginBase
 
@@ -194,7 +193,7 @@ class ImportPlugin(ImportPluginBase):
         """
             More to do for commodities
         """
-        tdb, tdenv = self.tdb, self.tdenv
+        tdenv = self.tdenv
         tdenv.NOTE("Processing {}", tableName)
         
         itmCount = 0
@@ -207,7 +206,6 @@ class ImportPlugin(ImportPluginBase):
             )
             # first line must be the column names
             columnDefs = next(csvIn)
-            columnCount = len(columnDefs)
             
             tdenv.DEBUG0("columnDefs: {}", columnDefs)
             
@@ -235,7 +233,8 @@ class ImportPlugin(ImportPluginBase):
                 tdenv.NOTE("Import stopped.", checkMe, localPath)
             else:
                 for lineIn in csvIn:
-                    if not lineIn: continue
+                    if not lineIn:
+                        continue
                     lineNo = csvIn.line_num
                     tdenv.DEBUG0("LINE {}: {}", lineNo, lineIn)
                     

tradedangerous/plugins/eddblink_plug.py

@@ -3,12 +3,10 @@
 # a EDDBlink_listener server to update the Database.
 # ----------------------------------------------------------------
 import certifi
-import codecs
 import csv
 import datetime
 import json
 import os
-import platform
 import sqlite3
 import ssl
 import time
@@ -16,12 +14,10 @@ import time
 from urllib import request
 from calendar import timegm
 from pathlib import Path
-from importlib import reload
 
-from .. import plugins, cache, csvexport, tradedb, tradeenv, transfers
+from .. import plugins, cache, transfers
 from ..misc import progress as pbar
 from ..plugins import PluginException
-from shutil import copyfile
 
 # Constants
 BASE_URL = os.environ.get('TD_SERVER') or "https://elite.tromador.com/files/"
@@ -32,7 +28,7 @@ def request_url(url, headers=None):
     data = None
     if headers:
         data = bytes(json.dumps(headers), encoding="utf-8")
-        
+    
     return request.urlopen(request.Request(url, data=data), context=CONTEXT)
 
 
@@ -194,25 +190,25 @@ class ImportPlugin(plugins.ImportPluginBase):
         Purges systems from the System table that do not have any stations claiming to be in them.
         Keeps table from becoming too large because of fleet carriers moving to unpopulated systems.
         """
-    
+        
         self.tdenv.NOTE("Purging Systems with no stations: Start time = {}", self.now())
-    
+        
         self.execute("PRAGMA foreign_keys = OFF")
-    
+        
         print("Saving systems with stations.... " + str(self.now()) + "\t\t\t\t", end="\r")
         self.execute("DROP TABLE IF EXISTS System_copy")
         self.execute("""CREATE TABLE System_copy AS SELECT * FROM System
                             WHERE system_id IN (SELECT system_id FROM Station)
                     """)
-    
+        
         print("Erasing table and reinserting kept systems.... " + str(self.now()) + "\t\t\t\t", end="\r")
         self.execute("DELETE FROM System")
         self.execute("INSERT INTO System SELECT * FROM System_copy")
-    
+        
         print("Removing copy.... " + str(self.now()) + "\t\t\t\t", end="\r")
         self.execute("PRAGMA foreign_keys = ON")
         self.execute("DROP TABLE IF EXISTS System_copy")
-    
+        
         self.tdenv.NOTE("Finished purging Systems. End time = {}", self.now())
     
     def commit(self):
@@ -352,7 +348,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         default = True
         for option in self.options:
             # if not option in ('force', 'fallback', 'skipvend', 'progbar'):
-            if not option in ('force', 'skipvend', 'prices'):
+            if option not in ('force', 'skipvend', 'prices'):
                 default = False
         if default:
             self.options["listings"] = True
@@ -470,11 +466,11 @@ class ImportPlugin(plugins.ImportPluginBase):
         if self.getOption("rare"):
             if self.downloadFile(self.rareItemPath) or self.getOption("force"):
                 buildCache = True
-
+        
         if self.getOption("shipvend"):
             if self.downloadFile(self.shipVendorPath) or self.getOption("force"):
                 buildCache = True
-
+        
         if self.getOption("upvend"):
             if self.downloadFile(self.upgradeVendorPath) or self.getOption("force"):
                 buildCache = True

tradedangerous/plugins/edmc_batch_plug.py

@@ -1,8 +1,6 @@
-import os
-import re
 from pathlib import Path
 
-from .. import tradedb, tradeenv, cache, fs
+from .. import fs
 from ..commands.exceptions import CommandLineError
 from . import PluginException, ImportPluginBase
 
@@ -63,7 +61,7 @@ class ImportPlugin(ImportPluginBase):
                 raise PluginException("EDMC Batch unable to process files with multiple stations. Use normal import.")
             
             for s in stations:
-                if(s in stations_seen):
+                if s in stations_seen:
                     cur_file = stations_seen[s]
                     # Set the newer file as the one we'll use.
                     stations_seen[s] = self.file_get_newer(cur_file, f)
@@ -81,7 +79,7 @@ class ImportPlugin(ImportPluginBase):
         fs.ensurefolder(tdenv.tmpDir)
         batchfile = tdenv.tmpDir / Path(self.BATCH_FILE)
         if batchfile.exists():
-                batchfile.unlink()
+            batchfile.unlink()
         # We now have a list of paths. Add all contents to a new file
         temp_file = open(batchfile, "w")
         

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.")