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

tradedangerous/commands/run_cmd.py

@@ -1,12 +1,17 @@
 from .commandenv import ResultRow
-from .exceptions import *
-from .parsing import *
+from .exceptions import CommandLineError, NoDataError
+from .parsing import (
+    BlackMarketSwitch, FleetCarrierArgument, MutuallyExclusiveGroup,
+    NoPlanetSwitch, OdysseyArgument, PadSizeArgument, ParseArgument,
+    PlanetaryArgument,
+)
 from itertools import chain
-from ..formatting import RowFormat, ColumnFormat
 from ..tradedb import TradeDB, System, Station, describeAge
 from ..tradecalc import TradeCalc, Route, NoHopsError
 
 import math
+import sys
+
 
 ######################################################################
 # Parser config
@@ -220,8 +225,7 @@ switches = [
         dest = 'x52pro',
     ),
     ParseArgument('--prune-score',
-        help = 'From the 3rd hop on, only consider routes which have ' \
-            'at least this percentage of the current best route''s score.',
+        help = 'From the 3rd hop on, only consider routes which have at least this percentage of the current best route''s score.',
         dest = 'pruneScores',
         type = float,
         default = 0,
@@ -261,7 +265,7 @@ switches = [
 # Helpers
 
 
-class Checklist(object):
+class Checklist:
     """
         Class for encapsulating display of a route as a series of
         steps to be 'checked off' as the user passes through them.
@@ -294,13 +298,13 @@ class Checklist(object):
         print("(i) {} (i){}".format(str, "\n" if addBreak else ""))
     
     def run(self, route, cr):
-        tdb, mfd = self.tdb, self.mfd
+        mfd = self.mfd
         stations, hops, jumps = route.route, route.hops, route.jumps
         lastHopIdx = len(stations) - 1
         gainCr = 0
         self.stepNo = 0
         
-        heading = "(i) BEGINNING CHECKLIST FOR {} (i)".format(route.str(lambda x, y : y))
+        heading = "(i) BEGINNING CHECKLIST FOR {} (i)".format(route.text(lambda x, y: y))
         print(heading, "\n", '-' * len(heading), "\n\n", sep = '')
         
         cmdenv = self.cmdenv
@@ -313,8 +317,8 @@ class Checklist(object):
             cur, nxt, hop = stations[idx], stations[idx + 1], hops[idx]
             sortedTradeOptions = sorted(
                 hop[0],
-                key = lambda tradeOption: \
-                    tradeOption[1] * tradeOption[0].gainCr, reverse = True
+                key=lambda tradeOption: tradeOption[1] * tradeOption[0].gainCr,
+                reverse=True
             )
             
             # Tell them what they need to buy.
@@ -345,7 +349,7 @@ class Checklist(object):
                 for jump in jumps[idx][1:]:
                     self.doStep('Jump to', jump.name())
             if cmdenv.detail:
-                self.doStep('Dock at', nxt.str())
+                self.doStep('Dock at', nxt.text())
             print()
             
             self.note("Sell at {}".format(nxt.name()))
@@ -413,9 +417,9 @@ def expandForJumps(tdb, cmdenv, calc, origin, jumps, srcName, purpose):
             [sys.dbname for sys in origins]
         )
         thisJump, origins = origins, set()
-        for sys in thisJump:
-            avoid.add(sys)
-            for stn in sys.stations or ():
+        for system in thisJump:
+            avoid.add(system)
+            for stn in system.stations or ():
                 if stn.ID not in tradingList:
                     cmdenv.DEBUG2(
                         "X {}/{} not in trading list",
@@ -433,7 +437,7 @@ def expandForJumps(tdb, cmdenv, calc, origin, jumps, srcName, purpose):
                     stn.system.dbname, stn.dbname,
                 )
                 stations.add(stn)
-            for dest, dist in tdb.genSystemsInRange(sys, maxLyPer):
+            for dest, dist in tdb.genSystemsInRange(system, maxLyPer):
                 if dest not in avoid:
                     origins.add(dest)
     
@@ -463,7 +467,7 @@ def expandForJumps(tdb, cmdenv, calc, origin, jumps, srcName, purpose):
         )
     
     stations = list(stations)
-    stations.sort(key = lambda stn: stn.ID)
+    stations.sort(key=lambda stn: stn.ID)
     
     return stations
 
@@ -666,16 +670,12 @@ def filterStationSet(src, cmdenv, calc, stnList):
         src,
         ",".join(station.name() for station in stnList),
         )
-    filtered = tuple(
+    stnList = tuple(
         place for place in stnList
-        if isinstance(place, System) or \
-            checkStationSuitability(cmdenv, calc, place, src)
+        if isinstance(place, System) or checkStationSuitability(cmdenv, calc, place, src)
     )
     if not stnList:
-        raise CommandLineError(
-                "No {} station met your criteria.".format(
-                    src
-        ))
+        raise CommandLineError("No {src} station met your criteria.")
     return stnList
 
 
@@ -969,9 +969,9 @@ def validateRunArguments(tdb, cmdenv, calc):
                 raise CommandLineError("Can't have same from/to with --unique")
         if viaSet:
             if len(origins) == 1 and origins[0] in viaSet:
-                raise("Can't have --from station in --via list with --unique")
+                raise CommandLineError("Can't have --from station in --via list with --unique")
             if len(destns) == 1 and destns[0] in viaSet:
-                raise("Can't have --to station in --via list with --unique")
+                raise CommandLineError("Can't have --to station in --via list with --unique")
     
     if cmdenv.mfd:
         cmdenv.mfd.display("Loading Trades")
@@ -1147,7 +1147,6 @@ def run(results, cmdenv, tdb):
     validateRunArguments(tdb, cmdenv, calc)
     
     origPlace, viaSet = cmdenv.origPlace, cmdenv.viaSet
-    avoidPlaces = cmdenv.avoidPlaces
     stopStations = cmdenv.destinations
     goalSystem = cmdenv.goalSystem
     maxLs = cmdenv.maxLs

tradedangerous/commands/sell_cmd.py

@@ -1,9 +1,13 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-from .exceptions import *
-from .parsing import *
+from .commandenv import ResultRow
+from .exceptions import CommandLineError, NoDataError
+from .parsing import (
+    AvoidPlacesArgument, BlackMarketSwitch, FleetCarrierArgument,
+    MutuallyExclusiveGroup, NoPlanetSwitch, OdysseyArgument,
+    PadSizeArgument, ParseArgument, PlanetaryArgument,
+)
 from ..tradedb import TradeDB, System, Station
+from ..formatting import RowFormat
 
-import math
 
 ######################################################################
 # Parser config
@@ -70,9 +74,7 @@ switches = [
 ######################################################################
 # Perform query and populate result set
 
-def run(results, cmdenv, tdb:TradeDB):
-    from .commandenv import ResultRow
-    
+def run(results, cmdenv, tdb: TradeDB):
     if cmdenv.lt and cmdenv.gt:
         if cmdenv.lt <= cmdenv.gt:
             raise CommandLineError("--gt must be lower than --lt")
@@ -199,8 +201,6 @@ def run(results, cmdenv, tdb:TradeDB):
 ## Transform result set into output
 
 def render(results, cmdenv, tdb):
-    from ..formatting import RowFormat, ColumnFormat
-    
     longestNamed = max(results.rows, key=lambda result: len(result.station.name()))
     longestNameLen = len(longestNamed.station.name())
     

tradedangerous/commands/shipvendor_cmd.py

@@ -1,18 +1,13 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
 from .commandenv import ResultRow
 from .exceptions import CommandLineError
-from .parsing import *
+from .parsing import MutuallyExclusiveGroup, ParseArgument
 from ..formatting import RowFormat, ColumnFormat, max_len
 from itertools import chain
-from ..tradedb import AmbiguityError
-from ..tradedb import System, Station
-from ..tradedb import TradeDB
+from ..tradedb import Station
 
 # Original by Dirk Wilhelm
 
 from .. import csvexport
-import re
-import sys
 
 ######################################################################
 # Parser config
@@ -211,6 +206,8 @@ def run(results, cmdenv, tdb):
     for ship in ships.values():
         if action(tdb, cmdenv, station, ship):
             dataToExport = True
+
+    cmdenv.DEBUG0("dataToExport = {}", dataToExport)
     
     maybeExportToCSV(tdb, cmdenv)
     

tradedangerous/commands/station_cmd.py

@@ -1,9 +1,8 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
 from .commandenv import ResultRow
 from .exceptions import CommandLineError
-from .parsing import *
+from .parsing import MutuallyExclusiveGroup, ParseArgument
 from ..tradedb import AmbiguityError
-from ..tradedb import System, Station
+from ..tradedb import Station
 from ..tradedb import TradeDB
 from .. import utils
 from ..formatting import max_len
@@ -12,7 +11,7 @@ from .. import cache
 from .. import csvexport
 import difflib
 import re
-import sys
+
 
 ######################################################################
 # Parser config
@@ -244,9 +243,7 @@ def checkSystemAndStation(tdb, cmdenv):
         sysName = None
     
     if not stnName:
-        raise CommandLineError("Invalid station name: {}".format(
-                envStnName
-        ))
+        raise CommandLineError("Invalid station name: {stnName}")
     
     if not sysName:
         raise CommandLineError("No system name specified")
@@ -346,7 +343,6 @@ def run(results, cmdenv, tdb):
     
     system, station = checkSystemAndStation(tdb, cmdenv)
     
-    systemName = cmdenv.system
     stationName = cmdenv.station
     
     if cmdenv.add:
@@ -367,7 +363,7 @@ def run(results, cmdenv, tdb):
     avgSell = results.summary.avgSelling = tdb.getAverageSelling()
     avgBuy = results.summary.avgBuying = tdb.getAverageBuying()
     
-    class ItemTrade(object):
+    class ItemTrade:
         def __init__(self, ID, price, avgAgainst):
             self.ID, self.item = ID, tdb.itemByID[ID]
             self.price = int(price)
@@ -492,11 +488,9 @@ def render(results, cmdenv, tdb):
     )
     print("Best Buy..:", makeBest(
             results.summary.selling, "Buy from this station", "Sell", longestNameLen,
-            starFn=lambda price, avgCr: \
-                price <= (avgCr * 0.9),
+            starFn=lambda price, avgCr: price <= (avgCr * 0.9),
     ))
     print("Best Sale.:", makeBest(
             results.summary.buying, "Sell to this station", "Cost", longestNameLen,
-            starFn=lambda price, avgCr: \
-                price >= (avgCr * 1.1),
-    ))
+            starFn=lambda price, avgCr: price >= (avgCr * 1.1),
+    ))

tradedangerous/commands/trade_cmd.py

@@ -1,10 +1,7 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-from .exceptions import *
-from .parsing import *
-from ..tradedb import TradeDB
-from ..tradecalc import TradeCalc, Route
-
-import math
+from .exceptions import CommandLineError
+from .parsing import ParseArgument
+from ..tradecalc import TradeCalc
+from ..formatting import RowFormat, max_len
 
 ######################################################################
 # Parser config
@@ -65,8 +62,6 @@ def run(results, cmdenv, tdb):
 ## Transform result set into output
 
 def render(results, cmdenv, tdb):
-    from ..formatting import RowFormat, ColumnFormat, max_len
-    
     longestNameLen = max_len(results.rows, key=lambda row: row.item.name(cmdenv.detail))
     
     rowFmt = RowFormat()
@@ -102,4 +97,4 @@ def render(results, cmdenv, tdb):
         print(heading, underline, sep='\n')
     
     for row in results.rows:
-        print(rowFmt.format(row))
+        print(rowFmt.format(row))

tradedangerous/commands/update_cmd.py

@@ -1,8 +1,7 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-from .parsing import *
+from .parsing import MutuallyExclusiveGroup, ParseArgument
 from ..tradeexcept import TradeException
 from .exceptions import CommandLineError
-from ..tradedb import System, Station
+from ..tradedb import System
 from .. import prices, cache
 import subprocess
 import os
@@ -167,7 +166,8 @@ def getEditorPaths(cmdenv, editorName, envVar, windowsFolders, winExe, nixExe):
     cmdenv.DEBUG0("Locating {} editor", editorName)
     try:
         return os.environ[envVar]
-    except KeyError: pass
+    except KeyError:
+        pass
     
     paths = []
     
@@ -183,7 +183,8 @@ def getEditorPaths(cmdenv, editorName, envVar, windowsFolders, winExe, nixExe):
     
     try:
         paths += os.environ['PATH'].split(os.pathsep)
-    except KeyError: pass
+    except KeyError:
+        pass
     
     for path in paths:
         candidate = os.path.join(path, binary)
@@ -271,8 +272,10 @@ def editUpdate(tdb, cmdenv, stationID):
     dbFilename = tdb.dbFilename
     try:
         elementMask = prices.Element.basic | prices.Element.supply
-        if cmdenv.timestamps: elementMask |= prices.Element.timestamp
-        if cmdenv.all: elementMask |= prices.Element.blanks
+        if cmdenv.timestamps:
+            elementMask |= prices.Element.timestamp
+        if cmdenv.all:
+            elementMask |= prices.Element.blanks
         # Open the file and dump data to it.
         with tmpPath.open("w", encoding = 'utf-8') as tmpFile:
             # Remember the filename so we know we need to delete it.

tradedangerous/commands/update_gui.py

@@ -1,9 +1,7 @@
 import tkinter as tk
 import tkinter.messagebox as mbox
-import tkinter.ttk as ttk
 import sqlite3
 import re
-from pathlib import Path
 
 """
 This is a crude attempt at a GUI for updating trade prices.
@@ -44,7 +42,7 @@ updateUiHelp = (
 "- Use Tab, Shift-Tab, Up/Down Arrow and Enter to navigate.\n"
 )
 
-class Item(object):
+class Item:
     """ Describe a listed, tradeable item """
     
     def __init__(self, ID, catID, name, displayNo):

tradedangerous/corrections.py

@@ -1,8 +1,6 @@
 # Provides an interface for correcting names that
 # have changed in recent versions.
 
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-
 # Arbitrary, negative value to denote something that's been removed.
 DELETED = -111
 
@@ -26,7 +24,7 @@ items = {
     'COOLING HOSES': 'Micro-weave Cooling Hoses',
     'METHANOL MONOHYDRATE': 'Methanol Monohydrate Crystals',
     'OCCUPIED CRYOPOD': 'Occupied Escape Pod',
-    'SALVAGEABLE WRECKAGE': 'Wreckage Components', 
+    'SALVAGEABLE WRECKAGE': 'Wreckage Components',
     'POLITICAL PRISONER': 'Political Prisoners',
     'HOSTAGE': 'Hostages',
     "VOID OPAL": "Void Opals",

tradedangerous/csvexport.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-
 from pathlib import Path
 from .tradeexcept import TradeException
 
@@ -34,9 +32,10 @@ reverseList = []
 # Helpers
 ######################################################################
 
-def search_keyList(list, val):
-    for row in list:
-        if row['from'] == row['to'] == val: return row
+def search_keyList(items, val):
+    for row in items:
+        if row['from'] == row['to'] == val:
+            return row
 
 def getUniqueIndex(conn, tableName):
     """ return all unique columns """
@@ -134,13 +133,14 @@ def exportTableToFile(tdb, tdenv, tableName, csvPath=None):
         pkCount = 0
         for columnRow in cur.execute("PRAGMA table_info('%s')" % tableName):
             # count the columns of the primary key
-            if columnRow['pk'] > 0: pkCount += 1
+            if columnRow['pk'] > 0:
+                pkCount += 1
         
         # build column list
         columnList = []
         for columnRow in cur.execute("PRAGMA table_info('%s')" % tableName):
             # if there is only one PK column, ignore it
-            #if columnRow['pk'] > 0 and pkCount == 1: continue
+            # if columnRow['pk'] > 0 and pkCount == 1: continue
             columnList.append(columnRow)
         
         if len(columnList) == 0:
@@ -199,7 +199,7 @@ def exportTableToFile(tdb, tdenv, tableName, csvPath=None):
                 stmtColumn += [ "{}.{}".format(tableName, col['name']) ]
         
         # build the SQL statement
-        sqlStmt = "SELECT {} FROM {}".format(",".join(stmtColumn)," ".join(stmtTable))
+        sqlStmt = "SELECT {} FROM {}".format(",".join(stmtColumn), " ".join(stmtTable))
         if len(stmtOrder) > 0:
             sqlStmt += " ORDER BY {}".format(",".join(stmtOrder))
         tdenv.DEBUG1("SQL: %s" % sqlStmt)

tradedangerous/edscupdate.py

@@ -25,7 +25,6 @@ or "q" to stop recording.
 """
 
 import argparse
-import math
 import misc.clipboard
 import misc.edsc
 import os
@@ -158,7 +157,7 @@ def parse_arguments():
             default=2,
     )
     grp = parser.add_mutually_exclusive_group()
-    if grp: # for indentation
+    if grp:  # for indentation
         grp.add_argument(
                 '--random',
                 action='store_true',
@@ -297,7 +296,7 @@ def check_database(tdb, name, x, y, z):
          WHERE pos_x BETWEEN ? and ?
            AND pos_y BETWEEN ? and ?
            AND pos_z BETWEEN ? and ?
-    """, [ 
+    """, [
         x - 0.5, x + 0.5,
         y - 0.5, y + 0.5,
         z - 0.5, z + 0.5,
@@ -391,9 +390,7 @@ def main():
                     edsq.status['statusnum'],
                 ))
     
-    date = data['date']
     systems = data['systems']
-    
     print("{} results".format(len(systems)))
     # Filter out systems we already know that match the EDSC data.
     systems = [
@@ -534,7 +531,7 @@ def main():
                 continue
             if ok.startswith('='):
                 name = ok[1:].strip().upper()
-                if not name in extras:
+                if name not in extras:
                     add_to_extras(argv, name)
                 ok = 'y'
             if ok.lower() != 'y':
@@ -555,6 +552,7 @@ def main():
             
             submit_distance(argv, name, distance)
 
+
 if __name__ == "__main__":
     try:
         main()

tradedangerous/edsmupdate.py

@@ -27,7 +27,6 @@ or "q" to stop recording.
 """
 
 import argparse
-import math
 import misc.clipboard
 import misc.edsm
 import os
@@ -67,7 +66,7 @@ def parse_arguments():
             default=os.environ.get('CMDR', None),
     )
     grp = parser.add_mutually_exclusive_group()
-    if grp: # for indentation
+    if grp:  # for indentation
         grp.add_argument(
                 '--random',
                 action='store_true',
@@ -271,7 +270,7 @@ def main():
             )
     
     if not argv.date:
-       argv.date = tdb.query("SELECT MAX(modified) FROM System").fetchone()[0]
+        argv.date = tdb.query("SELECT MAX(modified) FROM System").fetchone()[0]
     dateRe = re.compile(r'^20\d\d-(0[1-9]|1[012])-(0[1-9]|[12]\d|3[01]) ([01]\d|2[0123]):[0-5]\d:[0-5]\d$')
     if not dateRe.match(argv.date):
         raise UsageError(
@@ -440,7 +439,7 @@ def main():
                 break
             if ok.startswith('='):
                 name = ok[1:].strip().upper()
-                if not name in extras:
+                if name not in extras:
                     add_to_extras(argv, name)
                 ok = 'y'
             if ok.lower() != 'y':
@@ -462,6 +461,7 @@ def main():
         if argv.add and not commit:
             tdb.getDB().commit()
 
+
 if __name__ == "__main__":
     try:
         main()