summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/util/langhelpers.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-01-04 00:35:48 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-01-04 00:35:48 -0500
commitc450cd6cb6d0c8fed110abcec5bc17ec4e0e8c5e (patch)
tree5123348a03368a518a08614bd195927cd7abf03a /lib/sqlalchemy/util/langhelpers.py
parent31821011271bf2333b69954d53c3c922e39bf225 (diff)
downloadsqlalchemy-c450cd6cb6d0c8fed110abcec5bc17ec4e0e8c5e.tar.gz
- Fixed regression where using a ``functools.partial()`` with the event
system would cause a recursion overflow due to usage of inspect.getargspec() on it in order to detect a legacy calling signature for certain events, and apparently there's no way to do this with a partial object. Instead we skip the legacy check and assume the modern style; the check itself now only occurs for the SessionEvents.after_bulk_update and SessionEvents.after_bulk_delete events. Those two events will require the new signature style if assigned to a "partial" event listener. [ticket:2905]
Diffstat (limited to 'lib/sqlalchemy/util/langhelpers.py')
-rw-r--r--lib/sqlalchemy/util/langhelpers.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
index 7e261e38f..105b64c6b 100644
--- a/lib/sqlalchemy/util/langhelpers.py
+++ b/lib/sqlalchemy/util/langhelpers.py
@@ -268,7 +268,9 @@ def get_callable_argspec(fn, no_self=False):
return compat.ArgSpec(spec.args[1:], spec.varargs, spec.keywords, spec.defaults)
elif hasattr(fn, '__func__'):
return compat.inspect_getargspec(fn.__func__)
- elif hasattr(fn, '__call__'):
+ elif hasattr(fn, '__call__') and \
+ not hasattr(fn.__call__, '__call__'): # functools.partial does this;
+ # not much we can do
return get_callable_argspec(fn.__call__)
else:
raise ValueError("Can't inspect function: %s" % fn)