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

Added error messages to exceptions where possible

Browse Source 
Adds messages to exceptions where they may be useful and I could figure
out what they should be
This commit is contained in:
A_D 2020-07-07 18:30:29 +02:00
parent 34b963620a
commit 5c4c9fd3a7
No known key found for this signature in database
GPG Key ID: 4BE9EB7DF45076C4
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
companion.py
View File

@ -227,12 +227,12 @@ class Auth(object):
# Returns access token if successful, otherwise raises CredentialsError # Returns access token if successful, otherwise raises CredentialsError
if '?' not in payload: if '?' not in payload:
print('Auth\tMalformed response {!r}'.format(payload)) print('Auth\tMalformed response {!r}'.format(payload))
raise CredentialsError() # Not well formed raise CredentialsError('malformed payload') # Not well formed
data = urllib.parse.parse_qs(payload[payload.index('?') + 1:]) data = urllib.parse.parse_qs(payload[payload.index('?') + 1:])
if not self.state or not data.get('state') or data['state'][0] != self.state: if not self.state or not data.get('state') or data['state'][0] != self.state:
print('Auth\tUnexpected response {!r}'.format(payload)) print('Auth\tUnexpected response {!r}'.format(payload))
raise CredentialsError() # Unexpected reply raise CredentialsError('Unexpected response from authorization {!r}'.format(payload)) # Unexpected reply
if not data.get('code'): if not data.get('code'):
print('Auth\tNegative response {!r}'.format(payload)) print('Auth\tNegative response {!r}'.format(payload))
@ -314,12 +314,12 @@ class Session(object):
def login(self, cmdr=None, is_beta=None): def login(self, cmdr=None, is_beta=None):
# Returns True if login succeeded, False if re-authorization initiated. # Returns True if login succeeded, False if re-authorization initiated.
if not CLIENT_ID: if not CLIENT_ID:
raise CredentialsError() raise CredentialsError('cannot login without a valid client ID')
if not cmdr or is_beta is None: if not cmdr or is_beta is None:
# Use existing credentials # Use existing credentials
if not self.credentials: if not self.credentials:
raise CredentialsError() # Shouldn't happen raise CredentialsError('Missing credentials') # Shouldn't happen
elif self.state == Session.STATE_OK: elif self.state == Session.STATE_OK:
return True # already logged in return True # already logged in
@ -352,7 +352,8 @@ class Session(object):
# Callback from protocol handler # Callback from protocol handler
def auth_callback(self): def auth_callback(self):
if self.state != Session.STATE_AUTH: if self.state != Session.STATE_AUTH:
raise CredentialsError() # Shouldn't be getting a callback # Shouldn't be getting a callback
raise CredentialsError('Got an auth callback while not doing auth')
try: try:
self.start(self.auth.authorize(protocolhandler.lastpayload)) self.start(self.auth.authorize(protocolhandler.lastpayload))
@ -375,7 +376,7 @@ class Session(object):
return self.query(endpoint) return self.query(endpoint)
elif self.state == Session.STATE_AUTH: elif self.state == Session.STATE_AUTH:
raise CredentialsError() raise CredentialsError('cannot make a query when unauthorized')
try: try:
r = self.session.get(self.server + endpoint, timeout=timeout) r = self.session.get(self.server + endpoint, timeout=timeout)
@ -397,7 +398,7 @@ class Session(object):
elif 500 <= r.status_code < 600: elif 500 <= r.status_code < 600:
# Server error. Typically 500 "Internal Server Error" if server is down # Server error. Typically 500 "Internal Server Error" if server is down
self.dump(r) self.dump(r)
raise ServerError() raise ServerError('Received error {} from server'.format(r.status_code))
try: try:
r.raise_for_status() # Typically 403 "Forbidden" on token expiry r.raise_for_status() # Typically 403 "Forbidden" on token expiry