tradedangerous 11.1.3__tar.gz → 11.1.5__tar.gz

{tradedangerous-11.1.3/tradedangerous.egg-info → tradedangerous-11.1.5}/PKG-INFO

@@ -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 → tradedangerous-11.1.5}/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-11.1.3 → tradedangerous-11.1.5}/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-11.1.3 → tradedangerous-11.1.5}/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-11.1.3 → tradedangerous-11.1.5}/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 → tradedangerous-11.1.5/tradedangerous.egg-info}/PKG-INFO

@@ -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