matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

[lint] Rename exception variables to exc

Browse Source 
Use the more explicit (and common) exc instead of e as the variable
holding the exception in except handlers.
This commit is contained in:
Hornwitser
2018-08-01 11:41:15 +02:00
committed by Rapptz
parent 4ae8e81660
commit fa46b07db1
10 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
discord/client.py
View File

@ -246,8 +246,8 @@ class Client:
try:
result = condition(*args)
except Exception as e:
future.set_exception(e)
except Exception as exc:
future.set_exception(exc)
removed.append(i)
else:
if result:
@ -406,11 +406,11 @@ class Client:
aiohttp.ClientError,
asyncio.TimeoutError,
websockets.InvalidHandshake,
websockets.WebSocketProtocolError) as e:
websockets.WebSocketProtocolError) as exc:
if not reconnect:
await self.close()
if isinstance(e, ConnectionClosed) and e.code == 1000:
if isinstance(exc, ConnectionClosed) and exc.code == 1000:
# clean close, don't re-raise this
return
raise
@ -422,8 +422,8 @@ class Client:
# such as a clean disconnect (1000) or a bad state (bad token, no sharding, etc)
# sometimes, discord sends us 1000 for unknown reasons so we should reconnect
# regardless and rely on is_closed instead
if isinstance(e, ConnectionClosed):
if e.code != 1000:
if isinstance(exc, ConnectionClosed):
if exc.code != 1000:
await self.close()
raise