ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-10 12:22:27 +03:00
Code Issues Projects Releases Wiki Activity

EDDN: Use 'if key (not) in dict:' rather than .get() is (not) None

Browse Source
This commit is contained in:
Athanasius 2021-09-27 14:53:55 +01:00
parent 84ef77197d
commit 5546926776
No known key found for this signature in database
GPG Key ID: AE3E527847057C7D
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/eddn.py
View File

@ -656,17 +656,17 @@ Msg:\n{msg}'''
""" """
# If 'SystemName' or 'System' is there, it's directly from a journal event. # If 'SystemName' or 'System' is there, it's directly from a journal event.
# If they're not there *and* 'StarSystem' isn't either, then we add the latter. # If they're not there *and* 'StarSystem' isn't either, then we add the latter.
if entry.get('SystemName') is None and entry.get('System') is None and entry.get('StarSystem') is None: if 'SystemName' not in entry and 'System' not in entry and 'StarSystem' not in entry:
entry['StarSystem'] = system_name entry['StarSystem'] = system_name
if entry.get('SystemAddress') is None: if 'SystemAddress' not in entry:
if this.systemaddress is None: if this.systemaddress is None:
logger.warning("this.systemaddress is None, can't add SystemAddress") logger.warning("this.systemaddress is None, can't add SystemAddress")
return "this.systemaddress is None, can't add SystemAddress" return "this.systemaddress is None, can't add SystemAddress"
entry['SystemAddress'] = this.systemaddress entry['SystemAddress'] = this.systemaddress
if entry.get('StarPos') is None: if 'StarPos' not in entry:
if not this.coordinates: if not this.coordinates:
logger.warning("this.coordinates is None, can't add StarPos") logger.warning("this.coordinates is None, can't add StarPos")
return "this.coordinates is None, can't add StarPos" return "this.coordinates is None, can't add StarPos"
@ -777,7 +777,7 @@ Msg:\n{msg}'''
entry = filter_localised(entry) entry = filter_localised(entry)
# Keys specific to this event # Keys specific to this event
for k in ('IsNewEntry', 'NewTraitsDiscovered'): for k in ('IsNewEntry', 'NewTraitsDiscovered'):
if entry.get(k) is not None: if k in entry:
del entry[k] del entry[k]
####################################################################### #######################################################################
@ -884,7 +884,7 @@ Msg:\n{msg}'''
# Elisions # Elisions
####################################################################### #######################################################################
# WORKAROUND WIP EDDN schema | 2021-09-27: This will reject with the Odyssey flag present # WORKAROUND WIP EDDN schema | 2021-09-27: This will reject with the Odyssey flag present
if entry.get('odyssey') is not None: if 'odyssey' in entry:
del entry['odyssey'] del entry['odyssey']
####################################################################### #######################################################################