summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/events.py
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 /lib/sqlalchemy/orm/events.py
parent86e5419968be23b88ef7e2ba4de9ca6698f0540b (diff)
parente8a5ed9c1cbc5e9f0aebffad5ea78abb16167778 (diff)
downloadsqlalchemy-e45e4aa97d96421173da19d63f433795dad6e4e9.tar.gz
Merge remote-tracking branch 'origin/pr/210'
Diffstat (limited to 'lib/sqlalchemy/orm/events.py')
-rw-r--r--lib/sqlalchemy/orm/events.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py
index 671585e81..c13cb5a44 100644
--- a/lib/sqlalchemy/orm/events.py
+++ b/lib/sqlalchemy/orm/events.py
@@ -18,6 +18,7 @@ from .session import Session, sessionmaker
from .scoping import scoped_session
from .attributes import QueryableAttribute
from .query import Query
+from sqlalchemy.util.compat import inspect_getargspec
class InstrumentationEvents(event.Events):
"""Events related to class instrumentation events.
@@ -603,7 +604,7 @@ class MapperEvents(event.Events):
meth = getattr(cls, identifier)
try:
target_index = \
- inspect.getargspec(meth)[0].index('target') - 1
+ inspect_getargspec(meth)[0].index('target') - 1
except ValueError:
target_index = None