ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 08:17:13 +03:00
Code Issues Projects Releases Wiki Activity

Replaced oneline ifs with multiline ifs

Browse Source 
Oneline ifs are in general a bad idea in whitespace significant
languages, this replaces them with their multi-line equivalents
This commit is contained in:
A_D 2020-07-06 21:31:04 +02:00
parent 56d4d13d4d
commit 765dc0bcf3
No known key found for this signature in database
GPG Key ID: 4BE9EB7DF45076C4
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
companion.py
View File

@ -260,12 +260,15 @@ class Auth(object):
tokens[idx] = data.get('refresh_token', '')
config.set('fdev_apikeys', tokens)
config.save() # Save settings now for use by command-line app
return data.get('access_token')
except:
print('Auth\tCan\'t get token for %s' % self.cmdr)
print_exc()
if r: self.dump(r)
if r:
self.dump(r)
raise CredentialsError()
print('Auth\tCan\'t get token for %s' % self.cmdr)
@ -385,7 +388,9 @@ class Session(object):
r = self.session.get(self.server + endpoint, timeout=timeout)
except:
if __debug__: print_exc()
if __debug__:
print_exc()
raise ServerError()
if r.url.startswith(SERVER_AUTH):
@ -464,7 +469,8 @@ class Session(object):
self.session.close()
except:
if __debug__: print_exc()
if __debug__:
print_exc()
self.session = None
@ -497,7 +503,8 @@ def fixup(data):
# But also see https://github.com/Marginal/EDMarketConnector/issues/32
for thing in ['buyPrice', 'sellPrice', 'demand', 'demandBracket', 'stock', 'stockBracket']:
if not isinstance(commodity.get(thing), numbers.Number):
if __debug__: print('Invalid "%s":"%s" (%s) for "%s"' % (thing, commodity.get(thing), type(commodity.get(thing)), commodity.get('name', '')))
if __debug__:
print('Invalid "%s":"%s" (%s) for "%s"' % (thing, commodity.get(thing), type(commodity.get(thing)), commodity.get('name', '')))
break
else:
@ -512,16 +519,20 @@ def fixup(data):
pass
elif not commodity.get('categoryname'):
if __debug__: print('Missing "categoryname" for "%s"' % commodity.get('name', ''))
if __debug__:
print('Missing "categoryname" for "%s"' % commodity.get('name', ''))
elif not commodity.get('name'):
if __debug__: print('Missing "name" for a commodity in "%s"' % commodity.get('categoryname', ''))
if __debug__:
print('Missing "name" for a commodity in "%s"' % commodity.get('categoryname', ''))
elif not commodity['demandBracket'] in range(4):
if __debug__: print('Invalid "demandBracket":"%s" for "%s"' % (commodity['demandBracket'], commodity['name']))
if __debug__:
print('Invalid "demandBracket":"%s" for "%s"' % (commodity['demandBracket'], commodity['name']))
elif not commodity['stockBracket'] in range(4):
if __debug__: print('Invalid "stockBracket":"%s" for "%s"' % (commodity['stockBracket'], commodity['name']))
if __debug__:
print('Invalid "stockBracket":"%s" for "%s"' % (commodity['stockBracket'], commodity['name']))
else:
# Rewrite text fields