aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRapptz <[email protected]>2015-12-29 12:06:00 -0500
committerRapptz <[email protected]>2015-12-29 12:06:00 -0500
commit436d10ef395769c7f573154e96ef95b1e6f1b146 (patch)
treea2e45a2f52c6075556ce3c1d76b9a02bffed1a06
parentAdd missing ` in documentation for create_server (diff)
downloaddiscord.py-436d10ef395769c7f573154e96ef95b1e6f1b146.tar.xz
discord.py-436d10ef395769c7f573154e96ef95b1e6f1b146.zip
Simplify parser event check with hasattr rather than tuples.
-rw-r--r--discord/client.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/discord/client.py b/discord/client.py
index 9b83edb5..d5d1fe7a 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -351,16 +351,10 @@ class Client:
if event == 'VOICE_SERVER_UPDATE':
self._voice_data_found.data = data
self._voice_data_found.set()
+ return
- if event in ('READY', 'MESSAGE_CREATE', 'MESSAGE_DELETE',
- 'MESSAGE_UPDATE', 'PRESENCE_UPDATE', 'USER_UPDATE',
- 'CHANNEL_DELETE', 'CHANNEL_UPDATE', 'CHANNEL_CREATE',
- 'GUILD_MEMBER_ADD', 'GUILD_MEMBER_REMOVE', 'GUILD_UPDATE',
- 'GUILD_MEMBER_UPDATE', 'GUILD_CREATE', 'GUILD_DELETE',
- 'GUILD_ROLE_CREATE', 'GUILD_ROLE_DELETE', 'TYPING_START',
- 'GUILD_ROLE_UPDATE', 'VOICE_STATE_UPDATE',
- 'GUILD_BAN_ADD', 'GUILD_BAN_REMOVE'):
- parser = 'parse_' + event.lower()
+ parser = 'parse_' + event.lower()
+ if hasattr(self.connection, parser):
getattr(self.connection, parser)(data)
else:
log.info("Unhandled event {}".format(event))