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

tradedangerous/prices.py

@@ -9,20 +9,16 @@
 # --------------------------------------------------------------------
 # TradeDangerous :: Modules :: Generate TradeDangerous.prices
 
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-
 import sys
-import os
-import re
 import sqlite3
 
 
-class Element(object):
-    basic     = (1 << 0)
-    supply    = (1 << 1)
-    timestamp = (1 << 2)
-    full      = (basic | supply | timestamp)
-    blanks    = (1 <<31)
+class Element:      # TODO: enum?
+    basic     = 1 << 0
+    supply    = 1 << 1
+    timestamp = 1 << 2
+    full      = basic | supply | timestamp
+    blanks    = 1 <<31
 
 
 ######################################################################
@@ -42,20 +38,20 @@ def dumpPrices(
         If file is not none, outputs to the given file handle.
     """
     
-    withTimes  = (elementMask & Element.timestamp)
-    getBlanks  = (elementMask & Element.blanks)
+    withTimes  = elementMask & Element.timestamp
+    getBlanks  = elementMask & Element.blanks
     
     conn = sqlite3.connect(str(dbPath))
     conn.execute("PRAGMA foreign_keys=ON")
     cur  = conn.cursor()
     
-    systems = { ID: name for (ID, name) in cur.execute("SELECT system_id, name FROM System") }
+    systems = dict(cur.execute("SELECT system_id, name FROM System"))
     stations = {
         ID: [ name, systems[sysID] ]
         for (ID, name, sysID)
         in cur.execute("SELECT station_id, name, system_id FROM Station")
     }
-    categories = { ID: name for (ID, name) in cur.execute("SELECT category_id, name FROM Category") }
+    categories = dict(cur.execute("SELECT category_id, name FROM Category"))
     items = {
         ID: [ name, catID, categories[catID] ]
         for (ID, name, catID)
@@ -118,9 +114,10 @@ def dumpPrices(
         print(sql)
     cur.execute(sql)
     
-    lastSys, lastStn, lastCat = None, None, None
+    lastStn, lastCat = None, None
     
-    if not file: file = sys.stdout
+    if not file:
+        file = sys.stdout
     
     if stationID:
         stationSet = str(stations[stationID])
@@ -226,7 +223,9 @@ def dumpPrices(
     
     file.write(output)
 
-if __name__ == "__main__":
-    import tradedb
-    tdb = tradedb.TradeDB(load=False)
-    dumpPrices(tdb.dbPath, elementMask=Element.full)
+
+# if __name__ == "__main__":
+#     import tradedb
+# 
+#     tdb = tradedb.TradeDB(load=False)
+#     dumpPrices(tdb.dbPath, elementMask=Element.full)

tradedangerous/submit-distances.py

@@ -12,14 +12,8 @@ Use:
 # and submit a diff, that'd be greatly appreciated!
 #
 
-from __future__ import print_function
-
 import argparse
-import json
-import math
 import os
-import pathlib
-import platform
 import random
 import re
 import sys
@@ -52,7 +46,7 @@ or if you like, I can try and install it for you now
         raise e
     import pip
     pip.main(["install", "--upgrade", "requests"])
-    import requests
+    import requests  # noqa: F401
 
 standardStars = [
     "SOL",
@@ -67,7 +61,8 @@ standardStars = [
 
 class UsageError(Exception):
     def __init__(self, argv, error):
-       self.argv, self.error = argv, error
+        self.argv, self.error = argv, error
+        
     def __str__(self):
         return error + "\n" + argv.format_usage()