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

[lint] Replace equality comparisons to singletons

Browse Source 
Restrict the values accepted by comparisons with booleans to be actual
booleans.

Minor breaking of undocumented behaviour in permissions; the value to
set bits to must be booleans (as indicated by the type error thrown).
This commit is contained in:
Hornwitser
2018-06-22 16:56:02 +02:00
committed by Rapptz
parent fa46b07db1
commit 633192b3cd
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
discord/gateway.py
View File

@@ -363,7 +363,7 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol):
return return
if op == self.INVALIDATE_SESSION: if op == self.INVALIDATE_SESSION:
if data == True: if data is True:
await asyncio.sleep(5.0, loop=self.loop) await asyncio.sleep(5.0, loop=self.loop)
await self.close() await self.close()
raise ResumeWebSocket(self.shard_id) raise ResumeWebSocket(self.shard_id)

4
discord/permissions.py
View File

@@ -193,9 +193,9 @@ class Permissions:
return bool((self.value >> index) & 1) return bool((self.value >> index) & 1)
def _set(self, index, value): def _set(self, index, value):
if value == True: if value is True:
self.value |= (1 << index) self.value |= (1 << index)
elif value == False: elif value is False:
self.value &= ~(1 << index) self.value &= ~(1 << index)
else: else:
raise TypeError('Value to set for Permissions must be a bool.') raise TypeError('Value to set for Permissions must be a bool.')

16
discord/state.py
View File

@@ -298,7 +298,7 @@ class ConnectionState:
await self.request_offline_members(guilds) await self.request_offline_members(guilds)
for guild, unavailable in self._ready_state.guilds: for guild, unavailable in self._ready_state.guilds:
if unavailable == False: if unavailable is False:
self.dispatch('guild_available', guild) self.dispatch('guild_available', guild)
else: else:
self.dispatch('guild_join', guild) self.dispatch('guild_join', guild)
@@ -618,7 +618,7 @@ class ConnectionState:
self.dispatch('guild_emojis_update', guild, before_emojis, guild.emojis) self.dispatch('guild_emojis_update', guild, before_emojis, guild.emojis)
def _get_create_guild(self, data): def _get_create_guild(self, data):
if data.get('unavailable') == False: if data.get('unavailable') is False:
# GUILD_CREATE with unavailable in the response # GUILD_CREATE with unavailable in the response
# usually means that the guild has become available # usually means that the guild has become available
# and is therefore in the cache # and is therefore in the cache
@@ -639,14 +639,14 @@ class ConnectionState:
except asyncio.TimeoutError: except asyncio.TimeoutError:
log.info('Somehow timed out waiting for chunks.') log.info('Somehow timed out waiting for chunks.')
if unavailable == False: if unavailable is False:
self.dispatch('guild_available', guild) self.dispatch('guild_available', guild)
else: else:
self.dispatch('guild_join', guild) self.dispatch('guild_join', guild)
def parse_guild_create(self, data): def parse_guild_create(self, data):
unavailable = data.get('unavailable') unavailable = data.get('unavailable')
if unavailable == True: if unavailable is True:
# joined a guild with unavailable == True so.. # joined a guild with unavailable == True so..
return return
@@ -654,7 +654,7 @@ class ConnectionState:
# check if it requires chunking # check if it requires chunking
if guild.large: if guild.large:
if unavailable == False: if unavailable is False:
# check if we're waiting for 'useful' READY # check if we're waiting for 'useful' READY
# and if we are, we don't want to dispatch any # and if we are, we don't want to dispatch any
# event such as guild_join or guild_available # event such as guild_join or guild_available
@@ -678,7 +678,7 @@ class ConnectionState:
return return
# Dispatch available if newly available # Dispatch available if newly available
if unavailable == False: if unavailable is False:
self.dispatch('guild_available', guild) self.dispatch('guild_available', guild)
else: else:
self.dispatch('guild_join', guild) self.dispatch('guild_join', guild)
@@ -946,14 +946,14 @@ class AutoShardedConnectionState(ConnectionState):
await self.request_offline_members(sub_guilds, shard_id=shard_id) await self.request_offline_members(sub_guilds, shard_id=shard_id)
for guild, unavailable in zip(sub_guilds, sub_available): for guild, unavailable in zip(sub_guilds, sub_available):
if unavailable == False: if unavailable is False:
self.dispatch('guild_available', guild) self.dispatch('guild_available', guild)
else: else:
self.dispatch('guild_join', guild) self.dispatch('guild_join', guild)
self.dispatch('shard_ready', shard_id) self.dispatch('shard_ready', shard_id)
else: else:
for guild, unavailable in self._ready_state.guilds: for guild, unavailable in self._ready_state.guilds:
if unavailable == False: if unavailable is False:
self.dispatch('guild_available', guild) self.dispatch('guild_available', guild)
else: else:
self.dispatch('guild_join', guild) self.dispatch('guild_join', guild)