tradedangerous 11.0.2__tar.gz → 11.0.4__tar.gz

{tradedangerous-11.0.2/tradedangerous.egg-info → tradedangerous-11.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.0.2
+Version: 11.0.4
 Summary: Trade-Dangerous is a set of powerful trading tools for Elite Dangerous, organized around one of the most powerful trade run optimizers available.
 Home-page: https://github.com/eyeonus/Trade-Dangerous
 Author: eyeonus

{tradedangerous-11.0.2 → tradedangerous-11.0.4}/tradedangerous/cache.py

@@ -206,7 +206,7 @@ class MultipleItemEntriesError(DuplicateKeyError):
         super().__init__(fromFile, lineNo, 'item', item, prevLineNo)
 
 
-class SyntaxError(BuildCacheBaseException):
+class InvalidLineError(BuildCacheBaseException):
     """
     Raised when an invalid line is read.
     Attributes:
@@ -258,7 +258,7 @@ def parseSupply(pricesFile: Path, lineNo: int, category: str, reading: str) -> t
     #   High <- 'H';
     if reading == '?':
         return -1, -1
-    elif reading == '-':
+    if reading == '-':
         return 0, 0
     
     # extract the left most digits into unit and the last character into the level reading.
@@ -604,13 +604,13 @@ def processPrices(tdenv: TradeEnv, priceFile: Path, db: sqlite3.Connection, defa
         if text.startswith('@'):
             matches = systemStationRe.match(text)
             if not matches:
-                raise SyntaxError(priceFile, lineNo, "Unrecognized '@' line", text)
+                raise InvalidLineError(priceFile, lineNo, "Unrecognized '@' line", text)
             changeStation(matches)
             continue
         
         if not stationID:
             # Need a station to process any other type of line.
-            raise SyntaxError(priceFile, lineNo, "Expecting '@ SYSTEM / Station' line", text)
+            raise InvalidLineError(priceFile, lineNo, "Expecting '@ SYSTEM / Station' line", text)
         if stationID == DELETED:
             # Ignore all values from a deleted station/system.
             continue
@@ -625,7 +625,7 @@ def processPrices(tdenv: TradeEnv, priceFile: Path, db: sqlite3.Connection, defa
         # ## "Item sell buy ..." lines.
         matches = newItemPriceRe.match(text)
         if not matches:
-            raise SyntaxError(priceFile, lineNo, "Unrecognized line/syntax", text)
+            raise InvalidLineError(priceFile, lineNo, "Unrecognized line/syntax", text)
         
         processItemLine(matches)
     
@@ -639,7 +639,7 @@ def processPrices(tdenv: TradeEnv, priceFile: Path, db: sqlite3.Connection, defa
             "if you /need/ to persist them."
         )
     
-    stations = tuple((ID,) for ID in processedStations.keys())
+    stations = tuple((ID,) for ID in processedStations)
     return stations, items, zeros, newItems, updtItems, ignItems, numSys
 
 
@@ -649,9 +649,9 @@ def processPrices(tdenv: TradeEnv, priceFile: Path, db: sqlite3.Connection, defa
 def processPricesFile(tdenv: TradeEnv, db: sqlite3.Connection, pricesPath: Path, pricesFh: Optional[TextIO] = None, defaultZero: bool = False) -> None:
     tdenv.DEBUG0("Processing Prices file '{}'", pricesPath)
     
-    with pricesFh or pricesPath.open('r', encoding='utf-8') as pricesFh:
+    with (pricesFh or pricesPath.open('r', encoding='utf-8')) as fh:
         stations, items, zeros, newItems, updtItems, ignItems, numSys = processPrices(
-            tdenv, pricesFh, db, defaultZero
+            tdenv, fh, db, defaultZero
         )
     
     if not tdenv.mergeImport:
@@ -907,7 +907,7 @@ def processImportFile(tdenv, db, importPath, tableName):
                 try:
                     db.execute(sql_stmt, linein)
                     importCount += 1
-                except Exception as e:
+                except Exception as e:  # pylint: disable=broad-exception-caught
                     tdenv.WARN(
                         "*** INTERNAL ERROR: {err}\n"
                         "CSV File: {file}:{line}\n"

{tradedangerous-11.0.2 → tradedangerous-11.0.4}/tradedangerous/cli.py

@@ -32,34 +32,35 @@
 # to empower other programmers to do cool stuff.
 
 import os
+import sys
 import traceback
 
 from . import commands
+from . import tradeexcept
 from .commands import exceptions
 from .plugins import PluginException
 
-
 from . import tradedb
 
+if "CPROF" in os.environ:
+    import cProfile
+
 
 def main(argv = None):
-    import sys
     if not argv:
         argv = sys.argv
-    if sys.hexversion < 0x03040200:
+    if sys.hexversion < 0x03070000:
         raise SystemExit(
-            "Sorry: TradeDangerous requires Python 3.4.2 or higher.\n"
+            "Sorry: TradeDangerous requires Python 3.7 or higher.\n"
             "For assistance, see:\n"
             "\tBug Tracker: https://github.com/eyeonus/Trade-Dangerous/issues\n"
             "\tDocumentation: https://github.com/eyeonus/Trade-Dangerous/wiki\n"
             "\tEDForum Thread: https://forums.frontier.co.uk/showthread.php/441509\n"
         )
-    from . import tradeexcept
     
     try:
         try:
             if "CPROF" in os.environ:
-                import cProfile
                 cProfile.run("trade(argv)")
             else:
                 trade(argv)
@@ -79,7 +80,7 @@ def main(argv = None):
         print()
         print(traceback.format_exc())
         print(
-            "Please report this bug (http://kfs.org/td/issues). You may be "
+            "Please report this bug (http://github.com/eyeonus/Trade-Dangerous/issues). You may be "
             "able to work around it by using the '-q' parameter. Windows "
             "users may be able to use 'chcp.com 65001' to tell the console "
             "you want to support UTF-8 characters."

{tradedangerous-11.0.2 → tradedangerous-11.0.4}/tradedangerous/commands/parsing.py

@@ -60,7 +60,7 @@ class PadSizeArgument(int):
             'dest': 'padSize',
             'metavar': 'PADSIZES',
             'type': 'padsize',
-            'choices': 'SML?',
+            'choices': 'SsMmLl?',
         }
 
 
@@ -153,7 +153,7 @@ class PlanetaryArgument(int):
             'dest': 'planetary',
             'metavar': 'PLANETARY',
             'type': 'planetary',
-            'choices': 'YN??',
+            'choices': 'YyNn?',
         }
 
 
@@ -181,7 +181,7 @@ class FleetCarrierArgument(int):
             'dest': 'fleet',
             'metavar': 'FLEET',
             'type': 'fleet',
-            'choices': 'YN?',
+            'choices': 'YyNn?',
         }
 
 class OdysseyArgument(int):
@@ -208,7 +208,7 @@ class OdysseyArgument(int):
             'dest': 'odyssey',
             'metavar': 'ODYSSEY',
             'type': 'odyssey',
-            'choices': 'YN?',
+            'choices': 'YyNn?',
         }
 
 

{tradedangerous-11.0.2 → tradedangerous-11.0.4}/tradedangerous/csvexport.py

@@ -36,6 +36,7 @@ def search_keyList(items, val):
     for row in items:
         if row['from'] == row['to'] == val:
             return row
+    return None
 
 def getUniqueIndex(conn, tableName):
     """ return all unique columns """

{tradedangerous-11.0.2 → tradedangerous-11.0.4}/tradedangerous/formatting.py

@@ -8,7 +8,9 @@ import itertools
 import typing
 
 if typing.TYPE_CHECKING:
-    from typing import Any, Callable, Optional
+    from typing import Any, Optional
+    from collections.abc import Callable
+
 
 class ColumnFormat:
     """
@@ -197,8 +199,7 @@ if __name__ == '__main__':
     print("Simple usage:")
     present()
     
-    print()
-    print("Adding age ColumnFormat:")
-    
-    rowFmt.append(after='Name', col=ColumnFormat("Age", '>', 3, pre='|', post='|', key=lambda row: row['age']))
-    present()
+    #print()
+    #print("Adding age ColumnFormat:")
+    #rowFmt.append(after='Name', col=ColumnFormat("Age", '>', 3, pre='|', post='|', key=lambda row: row['age']))
+    #present()

{tradedangerous-11.0.2 → tradedangerous-11.0.4}/tradedangerous/misc/edsc.py

@@ -4,19 +4,7 @@ from collections import namedtuple
 from urllib.request import Request, urlopen
 
 import json
-
-try:
-    import requests
-except ImportError as e:
-    import pip
-    print("ERROR: Unable to load the Python 'requests' package.")
-    approval = input(
-        "Do you want me to try and install it with the package manager (y/n)? "
-    )
-    if approval.lower() != 'y':
-        raise e
-    pip.main(["install", "--upgrade", "requests"])
-    import requests
+import requests
 
 
 def edsc_log(apiCall, params, jsonData=None, error=None):

{tradedangerous-11.0.2 → tradedangerous-11.0.4}/tradedangerous/misc/edsm.py

@@ -6,19 +6,7 @@ uses EDSM - https://www.edsm.net/api
 """
 
 import json
-
-try:
-    import requests
-except ImportError as e:
-    import pip
-    print("ERROR: Unable to load the Python 'requests' package.")
-    approval = input(
-        "Do you want me to try and install it with the package manager (y/n)? "
-    )
-    if approval.lower() != 'y':
-        raise e
-    pip.main(["install", "--upgrade", "requests"])
-    import requests
+import requests
 
 
 def edsm_log(apiCall, url, params, jsonData=None, error=None):