Merge branch 'release-4.2.2' into releases

This commit is contained in:
Athanasius committed 2021-03-17 12:11:42 +00:00
commit 2ff3433245
3 files changed
+18 -4

No files matched your search

+10
View File
@@ -1,6 +1,16 @@
This is the master changelog for Elite Dangerous Market Connector. Entries are in reverse chronological order (latest first).
---
Release 4.2.2
===
This release contains a minor bug-fix, actually properly checking a station's
ships list before operating on it.
* Check that `ships['shipuard_list']` is a `dict` before trying to use
`.values()` on it. This fixes the issue with seeing `list object has no
attribute values` in the application status line.
Release 4.2.1
===
+1 -1
View File
@@ -13,7 +13,7 @@ appcmdname = 'EDMC'
# appversion **MUST** follow Semantic Versioning rules:
# <https://semver.org/#semantic-versioning-specification-semver>
# Major.Minor.Patch(-prerelease)(+buildmetadata)
appversion = '4.2.1' #-rc1+a872b5f'
appversion = '4.2.2' #-rc1+a872b5f'
# For some things we want appversion without (possible) +build metadata
appversion_nobuild = str(semantic_version.Version(appversion).truncate('prerelease'))
copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD'
+7 -3
View File
@@ -288,7 +288,7 @@ Msg:\n{msg}'''
logger.debug('modules was None. FC or Damaged Station?')
elif isinstance(modules, list):
if len(modules) == 0:
logger.debug('modules is empty list. Damaged Station?')
logger.debug('modules is empty list. FC or Damaged Station?')
else:
logger.error(f'modules is non-empty list: {modules!r}')
else:
@@ -807,10 +807,14 @@ def is_horizons(economies: MAP_STR_ANY, modules: MAP_STR_ANY, ships: MAP_STR_ANY
if isinstance(ships, dict):
if ships.get('shipyard_list') is not None:
ship_horizons = any(ship.get('sku') == HORIZ_SKU for ship in ships['shipyard_list'].values())
if isinstance(ships.get('shipyard_list'), dict):
ship_horizons = any(ship.get('sku') == HORIZ_SKU for ship in ships['shipyard_list'].values())
else:
logger.debug('ships["shipyard_list"] is not dict - FC or Damaged Station?')
else:
logger.debug('No ships["shipyard_list"] - Damaged station or FC ?')
logger.debug('ships["shipyard_list"] is None - FC or Damaged Station?')
else:
logger.error(f'ships type is {type(ships)}')