Refactor code to remove alerts as per lgtm and #1176.

This commit is contained in:
Griatch 2017-01-29 19:02:00 +01:00
parent dcde526f6d
commit 74eebfed6d
54 changed files with 226 additions and 264 deletions

View file

@ -105,6 +105,7 @@ class DefaultChannel(with_metaclass(TypeclassBase, ChannelDB)):
mutelist.append(subscriber)
self.db.mute_list = mutelist
return True
return False
def unmute(self, subscriber):
"""
@ -117,6 +118,7 @@ class DefaultChannel(with_metaclass(TypeclassBase, ChannelDB)):
mutelist.remove(subscriber)
self.db.mute_list = mutelist
return True
return False
def connect(self, subscriber):

View file

@ -31,13 +31,13 @@ class CommError(Exception):
# helper functions
#
def dbref(dbref, reqhash=True):
def dbref(inp, reqhash=True):
"""
Valid forms of dbref (database reference number) are either a
string '#N' or an integer N.
Args:
dbref (int or str): A possible dbref to check syntactically.
inp (int or str): A possible dbref to check syntactically.
reqhash (bool): Require an initial hash `#` to accept.
Returns:
@ -45,16 +45,16 @@ def dbref(dbref, reqhash=True):
dbref, otherwise `None`.
"""
if reqhash and not (isinstance(dbref, basestring) and dbref.startswith("#")):
if reqhash and not (isinstance(inp, basestring) and inp.startswith("#")):
return None
if isinstance(dbref, basestring):
dbref = dbref.lstrip('#')
if isinstance(inp, basestring):
inp = inp.lstrip('#')
try:
if int(dbref) < 0:
if int(inp) < 0:
return None
except Exception:
return None
return dbref
return inp
def identify_object(inp):
@ -128,6 +128,8 @@ def to_object(inp, objtype='player'):
return _ChannelDB.objects.get(id=obj)
logger.log_err("%s %s %s %s %s", objtype, inp, obj, typ, type(inp))
raise CommError()
# an unknown
return None
#
# Msg manager