tradedangerous 11.1.4__py3-none-any.whl → 11.1.6__py3-none-any.whl

tradedangerous/commands/buy_cmd.py

@@ -412,5 +412,5 @@ def render(results, cmdenv, tdb):
         print(stnRowFmt.format(row))
     
     if singleMode and cmdenv.detail:
-        msg = "-- Ship Cost" if mode is SHIP_MODE else "-- Average",
+        msg = "-- Ship Cost" if mode is SHIP_MODE else "-- Average"
         print(f"{msg:{maxStnLen}} {results.summary.avg:>10n}")

tradedangerous/mapping.py

@@ -100,7 +100,7 @@ class FDEVMappingItems(FDEVMappingBase):
         Maps ID to TD and EDDN items
     """
     tableName = "Item"
-    colNames  = [ 'fdev_id', 'name' ]
+    colNames  = [ 'item_id', 'name' ]
     
     def mapUnknown(self):
         # no ID known yet for:
@@ -113,7 +113,7 @@ class FDEVMappingShips(FDEVMappingBase):
         Maps ID to TD ships
     """
     tableName = "Ship"
-    colNames  = [ 'fdev_id', 'name' ]
+    colNames  = [ 'ship_id', 'name' ]
 
 class FDEVMappingShipyard(FDEVMappingBase):
     """

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())
@@ -188,10 +167,8 @@ class ImportPlugin(plugins.ImportPluginBase):
             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.4'
+__version__ = '11.1.6'
 

{tradedangerous-11.1.4.dist-info → tradedangerous-11.1.6.dist-info}/METADATA

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

@@ -11,7 +11,7 @@ tradedangerous/formatting.py,sha256=K3XL_mZJ4cAiTTTmJmTXK7ePYzzsSxg7EoBVFh7gj60,
 tradedangerous/fs.py,sha256=_5OJHIRy_M-WFHEZO4g2EIgqDxdrz4s8tcdDmgG7NME,2494
 tradedangerous/gui.py,sha256=DFsF5zATr-lyJShL6t5kPKvcLLJYkICurzBz0WBa-oQ,43676
 tradedangerous/jsonprices.py,sha256=V9Xm3pocQfEHoC38VYWomzbwX0wu9R2zJ2gB99JzYPQ,7212
-tradedangerous/mapping.py,sha256=eGBQeYPD04Kq_ygZCDRafKMGz9EnxSgXUzQU-u78_2A,4049
+tradedangerous/mapping.py,sha256=eMuoZJEyBNm4nl4fedznFVTlW-ZzfSsqEurKviVfgoU,4049
 tradedangerous/prices.py,sha256=JqiDVrtvvPd5pqE3HdwOHOuFgdAbOR-pt0GLD3ZIXM8,7425
 tradedangerous/submit-distances.py,sha256=zxHtRpX10soJKLuRcun9uelfXGq2S9jvIWxD--P9zus,11709
 tradedangerous/tools.py,sha256=pp-4WtA12SVaaQHFJFOMTF7EDFRCU2mQeOhC4xoXmEk,1331
@@ -21,11 +21,11 @@ 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=5eX-o8e6DHQLNfwJLHkmRQAAtV7y1dzLdlazgmPIdH8,646
+tradedangerous/version.py,sha256=lGhsguDgMiXXRc-pqyCRlPg_29WWX6fpwCtVgfLAHv0,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
-tradedangerous/commands/buy_cmd.py,sha256=VbHSUI9eocaQAdzaLRnHr-Nsnu15Q2WlhC3VzMK_3KQ,13924
+tradedangerous/commands/buy_cmd.py,sha256=GZa4wx5NKsZLKx1vtO1a47hSL8la5fatOY3dCazQSSo,13923
 tradedangerous/commands/commandenv.py,sha256=lzPbxhrgx4PJL_x8pRdYu22rqtL4U6kNQ5ExXTPoAao,9462
 tradedangerous/commands/exceptions.py,sha256=xJib2n0YRSgrs8WhZX5IeVHM-XakS3YwfjlF8_cNx4E,3476
 tradedangerous/commands/export_cmd.py,sha256=VfxwrNU_TzrSw71KrmtmXKYCBkpDGr5KRLGPXOBewnI,4405
@@ -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=P-Z4szyP8dsKPvnm7O7KbdT-65oOvvLKqyuudMSWfUg,22887
+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.4.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-11.1.4.dist-info/METADATA,sha256=8GX1JREqpfffxkJmZ6JtlzbBhbhQqyLHHfEAYpWsNhE,4435
-tradedangerous-11.1.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tradedangerous-11.1.4.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
-tradedangerous-11.1.4.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
-tradedangerous-11.1.4.dist-info/RECORD,,
+tradedangerous-11.1.6.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-11.1.6.dist-info/METADATA,sha256=7gXwNVfujBjGqOj7Dz3JEry6COqcVCMucwcZubHQHCw,4435
+tradedangerous-11.1.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tradedangerous-11.1.6.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-11.1.6.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-11.1.6.dist-info/RECORD,,