tradedangerous 11.1.3__py3-none-any.whl → 11.1.5__py3-none-any.whl

trade.py

@@ -35,10 +35,10 @@
 # to empower other programmers to do cool stuff.
 from tradedangerous import cli
 
+import sys
+
 def main(argv = None):
-  import sys
-  cli.main(sys.argv)
+    cli.main(sys.argv)
 
 if __name__ == "__main__":
-  import sys
-  cli.main(sys.argv)
+    cli.main(sys.argv)

tradedangerous/formatting.py

@@ -199,7 +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/plugins/eddblink_plug.py

@@ -12,39 +12,18 @@ from ..plugins import PluginException
 import certifi
 import csv
 import datetime
+from email.utils import parsedate_to_datetime
 import os
 import requests
 import sqlite3
 import ssl
 import typing
-import locale
-import platform
 
 
 if typing.TYPE_CHECKING:
     from typing import Optional
     from .. tradeenv import TradeEnv
 
-# Find the first English UTF-8 locale for use in parsing timestamps.
-LOCALE = None
-if platform.system() == 'Windows':
-    for lang in locale.windows_locale.values():
-        if "en" in lang:
-            LOCALE = lang
-            break
-else:
-    # for other operating systems
-    for lang in locale.locale_alias.values():
-        if "en" in lang and "UTF-8" in lang:
-            LOCALE = lang
-            break
-if not LOCALE:
-    raise PluginException(
-        "Unable to find compatible locale.\n" +
-        "This plugin needs an English, UTF-8 compatible " +
-        "locale installed in order to function correctly.\n" + 
-        "Please refer to your OS for instructions installing one."
-    )
 # Constants
 BASE_URL = os.environ.get('TD_SERVER') or "https://elite.tromador.com/files/"
 CONTEXT=ssl.create_default_context(cafile=certifi.where())
@@ -181,17 +160,15 @@ class ImportPlugin(plugins.ImportPluginBase):
         # Use an HTTP Request header to obtain the Last-Modified and Content-Length headers.
         # Also, tell the server to give us the un-compressed length of the file by saying
         # that >this< request only wants text.
-        headers = {"User-Agent": "Trade-Dangerous", "Accept-Encoding": "text"}
+        headers = {"User-Agent": "Trade-Dangerous", "Accept-Encoding": "identity"}
         try:
             response = requests.head(url, headers=headers, timeout=70)
         except Exception as e:  # pylint: disable=broad-exception-caught
             self.tdenv.WARN("Problem with download:\n    URL: {}\n    Error: {}", url, str(e))
             return False
         
-        locale.setlocale(locale.LC_ALL, LOCALE)
         last_modified = response.headers.get("last-modified")
-        dump_mod_time = datetime.datetime.strptime(last_modified, "%a, %d %b %Y %H:%M:%S %Z").timestamp()
-        locale.setlocale(locale.LC_ALL, '')
+        dump_mod_time = parsedate_to_datetime(last_modified).timestamp()
         
         if Path.exists(localPath):
             local_mod_time = localPath.stat().st_mtime
@@ -352,8 +329,6 @@ class ImportPlugin(plugins.ImportPluginBase):
         self.tdenv.NOTE("Finished processing market data. End time = {}", self.now())
     
     def run(self):
-        self.tdenv.DEBUG2(f'Using "{LOCALE}" locale for parsing modified timestamps. Please include this information in any error reports.')
-        
         self.tdenv.ignoreUnknown = True
         
         # Create the /eddb folder for downloading the source files if it doesn't exist.

tradedangerous/version.py

@@ -12,5 +12,5 @@
 """just keeper of current version"""
 
 # TODO: remember to update tests when version changes
-__version__ = '11.1.3'
+__version__ = '11.1.5'
 

{tradedangerous-11.1.3.dist-info → tradedangerous-11.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.1.3
+Version: 11.1.5
 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.1.3.dist-info → tradedangerous-11.1.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trade.py,sha256=vBEJZR3Bybesw9FMelcHOTRA7KqKeH-4_wqbJ4VMB_E,1779
+trade.py,sha256=Skqy0bC47g1KujuYrVwa3T8AfJ9NoLLOZcVjjxJ2daQ,1769
 tradegui.py,sha256=q2HdIdoyeLUpeF2X0hVIGn7sU6T4zOzq1HN0zGvZdyE,788
 tradedangerous/__init__.py,sha256=bwsbE_GyCNsuyGDKnfXAg0RD-ewsWHliySJ5QfCK7h8,1166
 tradedangerous/cache.py,sha256=N7z1e2fov003wIh_aHkw1pdByKDPt3FkDZiH_EEPdMc,36080
@@ -7,7 +7,7 @@ tradedangerous/corrections.py,sha256=_WLgo1IBWoskrrPFeshRwCOeJ2BeJb_x4tDQ0JdAo-s
 tradedangerous/csvexport.py,sha256=_19bGVnCGJPzvx_8DzLGOs4rqx8Asn7eCVdXKdKu92E,8653
 tradedangerous/edscupdate.py,sha256=G8N-j61MZbCgY07WIVK23CCw6eMPE3WkraXHeARt9QE,17297
 tradedangerous/edsmupdate.py,sha256=jpDUxUkDKxlG_gS3qWy5fg9p3mBPC-akU2pHSlfTPkI,14915
-tradedangerous/formatting.py,sha256=-FdlH1yMKPkqhpCtKmbl0chbyZ1VjKZsZ8OLc8v-Knc,6927
+tradedangerous/formatting.py,sha256=K3XL_mZJ4cAiTTTmJmTXK7ePYzzsSxg7EoBVFh7gj60,6931
 tradedangerous/fs.py,sha256=_5OJHIRy_M-WFHEZO4g2EIgqDxdrz4s8tcdDmgG7NME,2494
 tradedangerous/gui.py,sha256=DFsF5zATr-lyJShL6t5kPKvcLLJYkICurzBz0WBa-oQ,43676
 tradedangerous/jsonprices.py,sha256=V9Xm3pocQfEHoC38VYWomzbwX0wu9R2zJ2gB99JzYPQ,7212
@@ -21,7 +21,7 @@ tradedangerous/tradeenv.py,sha256=SDzRC6ERYZzzb_I6uexmFpFJJrnbzXa-1ogYt_GH26w,10
 tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
 tradedangerous/transfers.py,sha256=KwskYBB5_TYDXx5fkN1ABYsPuPnICKdkEx0WUfC7BnA,8378
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=ghxPDFkK4akB_kG7EbpxFhrsQPs8VjNqdIUWHOPecuc,646
+tradedangerous/version.py,sha256=RW4r1F63KW3hk-PZN1UtKuplBR5kfZV1j0tMS5F4kaw,646
 tradedangerous/commands/TEMPLATE.py,sha256=MOE69xsZPHPIMBQ-LXicfsOlCZdy-2gPX_nlnwYYil8,2026
 tradedangerous/commands/__init__.py,sha256=3gz2cnXNZNkV1gtZh0dOnCRxBkQHbeIyysRe3bM2WEE,9516
 tradedangerous/commands/buildcache_cmd.py,sha256=jhNSqHX_xX43SiSUMFiKtWpB9v4oeZ0sqfNq6DCrjUs,2181
@@ -62,7 +62,7 @@ tradedangerous/misc/progress.py,sha256=NKvKP1OSCTpItc1CNxDuEH2A1oGJ6aWSyCdPSAjsG
 tradedangerous/plugins/__init__.py,sha256=TL-OIptlqNENKhoFqkFeBJn_vSw8L0pVaDJgjhaTj7A,7860
 tradedangerous/plugins/edapi_plug.py,sha256=5nqBYmjUceAt-KTfiBn7IEl443R1SsGLDmfVXgbcyms,42262
 tradedangerous/plugins/edcd_plug.py,sha256=JuDtuEM_mN9Sz2H09-qYizM-9N3cuNjgvQy7Y-wHwKw,14412
-tradedangerous/plugins/eddblink_plug.py,sha256=xK5snHevw8BIFfpYNtrJYRQekDD0DYkp62kcxSrkZ-8,22883
+tradedangerous/plugins/eddblink_plug.py,sha256=EOqUAwbIpQztbhLstFkgOdIgVFCyquSGYmtRr_6PYDY,21931
 tradedangerous/plugins/edmc_batch_plug.py,sha256=rrP_lFFxWsba8DPEo0WF2EdCiMoRC7tCT8z62MIvtIo,4173
 tradedangerous/plugins/journal_plug.py,sha256=5HMyoxQ7z42qj7NiL8rDxSyTN9gKikoQjyWzJLD-SYQ,23746
 tradedangerous/plugins/netlog_plug.py,sha256=yUl47l9xt3kGj9oSiY_FZaDGdnQj63oa9MBtSeIy1Zo,13469
@@ -71,9 +71,9 @@ tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTK
 tradedangerous/templates/Category.csv,sha256=8xwUDcBZE25T6x6dZGlRUMTCqeDLt3a9LXU5h6hRHV8,250
 tradedangerous/templates/RareItem.csv,sha256=F1RhRnTD82PiwrVUO-ai2ErGH2PTqNnQaDw5mcgljXs,10483
 tradedangerous/templates/TradeDangerous.sql,sha256=VlQK7QGtEi2brGtWaIZDvKmbJ_vLocD4CJ8h_6kKptU,7808
-tradedangerous-11.1.3.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-11.1.3.dist-info/METADATA,sha256=_YJd9yECrUzNkslTW4-PSLUoJPuS_EJIV3Dkxdymyq0,4435
-tradedangerous-11.1.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-11.1.3.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
-tradedangerous-11.1.3.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
-tradedangerous-11.1.3.dist-info/RECORD,,
+tradedangerous-11.1.5.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-11.1.5.dist-info/METADATA,sha256=vL1cKyh5Qp1R9sHAv_mlmJgU-vqjEQQumPuyibG-Wew,4435
+tradedangerous-11.1.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-11.1.5.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-11.1.5.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-11.1.5.dist-info/RECORD,,