Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change callability check

Browse source 
TypeErrors are thrown in a wide variety of situations, most of which
have nothing to do with calling an uncallable object. The appropriate
test is to use the built-in callable() function, which actually
tests if the object is callable.
This commit is contained in:
Aris (Karim) Merchant 2018-07-30 16:37:22 -07:00
parent 27875ba04d
commit 1feceea4e8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/commands/cmdset.py
View file

@ -296,9 +296,9 @@ class CmdSet(with_metaclass(_CmdSetMeta, object)):
result (any): An instantiated Command or the input unmodified. result (any): An instantiated Command or the input unmodified.
""" """
try: if callable(cmd):
return cmd() return cmd()
except TypeError: else:
return cmd return cmd
def _duplicate(self): def _duplicate(self):