summaryrefslogtreecommitdiff
path: root/test/base/test_utils.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 /test/base/test_utils.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 'test/base/test_utils.py')
-rw-r--r--test/base/test_utils.py31
1 files changed, 30 insertions, 1 deletions
diff --git a/test/base/test_utils.py b/test/base/test_utils.py
index 1946bd704..86e4b190a 100644
--- a/test/base/test_utils.py
+++ b/test/base/test_utils.py
@@ -4,7 +4,7 @@ from sqlalchemy import util, sql, exc, testing
from sqlalchemy.testing import assert_raises, assert_raises_message, fixtures
from sqlalchemy.testing import eq_, is_, ne_, fails_if
from sqlalchemy.testing.util import picklers, gc_collect
-from sqlalchemy.util import classproperty, WeakSequence
+from sqlalchemy.util import classproperty, WeakSequence, get_callable_argspec
class KeyedTupleTest():
@@ -1184,6 +1184,33 @@ class ArgInspectionTest(fixtures.TestBase):
test(f3)
test(f4)
+ def test_callable_argspec_fn(self):
+ def foo(x, y, **kw):
+ pass
+ eq_(
+ get_callable_argspec(foo),
+ (['x', 'y'], None, 'kw', None)
+ )
+
+ def test_callable_argspec_method(self):
+ class Foo(object):
+ def foo(self, x, y, **kw):
+ pass
+ eq_(
+ get_callable_argspec(Foo.foo),
+ (['self', 'x', 'y'], None, 'kw', None)
+ )
+
+ def test_callable_argspec_partial(self):
+ from functools import partial
+ def foo(x, y, z, **kw):
+ pass
+ bar = partial(foo, 5)
+
+ assert_raises(
+ ValueError,
+ get_callable_argspec, bar
+ )
class SymbolTest(fixtures.TestBase):
@@ -1665,3 +1692,5 @@ class TestClassProperty(fixtures.TestBase):
return d
eq_(B.something, {'foo': 1, 'bazz': 2})
+
+