GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-01 01:09:22 +01:00
Code Issues Projects Releases Wiki Activity

use isinstance() instead of type() where appropriate #410

Browse Source
This commit is contained in:
Mitchell Cooper 2017-07-12 17:29:34 -04:00
parent 87fe7693b0
commit 7ab0e8f105
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
classes.py
View File

@ -507,7 +507,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
# C = Mode that changes a setting and only has a parameter when set. # C = Mode that changes a setting and only has a parameter when set.
# D = Mode that changes a setting and never has a parameter. # D = Mode that changes a setting and never has a parameter.
if type(args) == str: if isinstance(args, str):
# If the modestring was given as a string, split it into a list. # If the modestring was given as a string, split it into a list.
args = args.split() args = args.split()
@ -697,9 +697,10 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
=> {('-m', None), ('-r', None), ('-l', None), ('+o', 'person')}) => {('-m', None), ('-r', None), ('-l', None), ('+o', 'person')})
{('s', None), ('+o', 'whoever') => {('-s', None), ('-o', 'whoever')}) {('s', None), ('+o', 'whoever') => {('-s', None), ('-o', 'whoever')})
""" """
origtype = type(modes) origstring = isinstance(modes, str)
# If the query is a string, we have to parse it first. # If the query is a string, we have to parse it first.
if origtype == str: if origstring:
modes = self.parse_modes(target, modes.split(" ")) modes = self.parse_modes(target, modes.split(" "))
# Get the current mode list first. # Get the current mode list first.
if utils.isChannel(target): if utils.isChannel(target):
@ -755,7 +756,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
newmodes.append(mpair) newmodes.append(mpair)
log.debug('(%s) reverse_modes: new modes: %s', self.name, newmodes) log.debug('(%s) reverse_modes: new modes: %s', self.name, newmodes)
if origtype == str: if origstring:
# If the original query is a string, send it back as a string. # If the original query is a string, send it back as a string.
return self.join_modes(newmodes) return self.join_modes(newmodes)
else: else:
@ -1074,8 +1075,8 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
# conditions that would otherwise desync channel modes. # conditions that would otherwise desync channel modes.
with self._ts_lock: with self._ts_lock:
our_ts = self.channels[channel].ts our_ts = self.channels[channel].ts
assert type(our_ts) == int, "Wrong type for our_ts (expected int, got %s)" % type(our_ts) assert isinstance(our_ts, int), "Wrong type for our_ts (expected int, got %s)" % type(our_ts)
assert type(their_ts) == int, "Wrong type for their_ts (expected int, got %s)" % type(their_ts) assert isinstance(their_ts, int), "Wrong type for their_ts (expected int, got %s)" % type(their_ts)
# Check if we're the mode sender based on the UID / SID given. # Check if we're the mode sender based on the UID / SID given.
our_mode = self.is_internal_client(sender) or self.is_internal_server(sender) our_mode = self.is_internal_client(sender) or self.is_internal_server(sender)

2
protocols/ircs2s_common.py
View File

@ -151,7 +151,7 @@ class IRCCommonProtocol(IRCNetwork):
Parses a string of capabilities in the 005 / RPL_ISUPPORT format. Parses a string of capabilities in the 005 / RPL_ISUPPORT format.
""" """
if type(args) == str: if isinstance(args, str):
args = args.split(' ') args = args.split(' ')
caps = {} caps = {}

4
utils.py
View File

@ -243,13 +243,13 @@ class ServiceBot():
Joins the given service bot to the given channel(s). Joins the given service bot to the given channel(s).
""" """
if type(irc) == str: if isinstance(irc, str):
netname = irc netname = irc
else: else:
netname = irc.name netname = irc.name
# Ensure type safety: pluralize strings if only one channel was given, then convert to set. # Ensure type safety: pluralize strings if only one channel was given, then convert to set.
if type(channels) == str: if isinstance(channels, str):
channels = [channels] channels = [channels]
channels = set(channels) channels = set(channels)