summaryrefslogtreecommitdiff
path: root/test/orm
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-11-30 11:40:44 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2015-11-30 11:40:44 -0500
commite45e4aa97d96421173da19d63f433795dad6e4e9 (patch)
tree76b6da7639a8ad1a559647df49bef8649781cfe6 /test/orm
parent86e5419968be23b88ef7e2ba4de9ca6698f0540b (diff)
parente8a5ed9c1cbc5e9f0aebffad5ea78abb16167778 (diff)
downloadsqlalchemy-e45e4aa97d96421173da19d63f433795dad6e4e9.tar.gz
Merge remote-tracking branch 'origin/pr/210'
Diffstat (limited to 'test/orm')
-rw-r--r--test/orm/test_session.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/orm/test_session.py b/test/orm/test_session.py
index f6ddcb566..caeb08530 100644
--- a/test/orm/test_session.py
+++ b/test/orm/test_session.py
@@ -17,6 +17,7 @@ from sqlalchemy.util import pypy
from sqlalchemy.testing import fixtures
from test.orm import _fixtures
from sqlalchemy import event, ForeignKey
+from sqlalchemy.util.compat import inspect_getargspec
class ExecutionTest(_fixtures.FixtureTest):
@@ -1483,7 +1484,7 @@ class SessionInterface(fixtures.TestBase):
for meth in Session.public_methods:
if meth in blacklist:
continue
- spec = inspect.getargspec(getattr(Session, meth))
+ spec = inspect_getargspec(getattr(Session, meth))
if len(spec[0]) > 1 or spec[1]:
ok.add(meth)
return ok