TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

hasattr(function, __call__) is not a valid callable check! use callable instead, which catches inittable objects

Browse Source
This commit is contained in:
Zachary Pavlov 2010-03-19 22:49:24 +00:00
parent 599e8eff89
commit 77318b23df
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/showbase/PythonUtil.py
View File

@ -92,7 +92,7 @@ def Functor(function, *args, **kArgs):
class Functor: class Functor:
def __init__(self, function, *args, **kargs): def __init__(self, function, *args, **kargs):
assert hasattr(function, '__call__'), "function should be a callable obj" assert callable(function), "function should be a callable obj"
self._function = function self._function = function
self._args = args self._args = args
self._kargs = kargs self._kargs = kargs
@ -117,7 +117,7 @@ class Functor:
_kargs.update(kargs) _kargs.update(kargs)
return self._function(*(self._args + args), **_kargs) return self._function(*(self._args + args), **_kargs)
# this method is used in place of __call__ if we are recording creation stacks # this methoxd is used in place of __call__ if we are recording creation stacks
def _exceptionLoggedCreationStack__call__(self, *args, **kargs): def _exceptionLoggedCreationStack__call__(self, *args, **kargs):
try: try:
return self._do__call__(*args, **kargs) return self._do__call__(*args, **kargs)