From 09730adbe6ad1760159fa4bec9bfdaf52f875387 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 9 Mar 2021 13:12:28 +0000 Subject: [PATCH] Remove last references to, and generation of, stations.p file. This was historically used by the core EDDB plugin to construct a valid URL for a given station. EDDB has long-since provided alternate URL formats that negate the need for this. Plugin authors have been warned not to use this already. --- EDMarketConnector.wxs | 4 ---- eddb.py | 11 ----------- setup.py | 2 -- 3 files changed, 17 deletions(-) diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs index 9013912c..106e7a1a 100644 --- a/EDMarketConnector.wxs +++ b/EDMarketConnector.wxs @@ -218,9 +218,6 @@ - - - @@ -613,7 +610,6 @@ - diff --git a/eddb.py b/eddb.py index eb3f2ad1..367c755d 100755 --- a/eddb.py +++ b/eddb.py @@ -114,14 +114,3 @@ if __name__ == "__main__": with open('systems.p', 'wb') as h: pickle.dump(system_ids, h, protocol = pickle.HIGHEST_PROTOCOL) print('\n%d saved systems' % len(system_ids)) - - # station_id by (system_id, station_name) - stations = json.loads(download('stations.json').content) # let json do the utf-8 decode - station_ids = { - (x['system_id'], x['name']) : x['id'] # Pilgrim's Ruin in HR 3005 id 70972 has U+2019 quote - for x in stations if x['max_landing_pad_size'] - } - - with open('stations.p', 'wb') as h: - pickle.dump(station_ids, h, protocol = pickle.HIGHEST_PROTOCOL) - print('\n%d saved stations' % len(station_ids)) diff --git a/setup.py b/setup.py index 14cefcaa..446f36f3 100755 --- a/setup.py +++ b/setup.py @@ -133,7 +133,6 @@ if sys.platform == 'darwin': 'snd_bad.wav', 'modules.p', 'ships.p', - 'stations.p', 'systems.p' ], 'site_packages': False, @@ -195,7 +194,6 @@ elif sys.platform=='win32': 'snd_bad.wav', 'modules.p', 'ships.p', - 'stations.p', 'systems.p', '%s.VisualElementsManifest.xml' % APPNAME, '%s.ico' % APPNAME,