summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-01-17 16:24:26 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-01-17 16:24:26 +0000
commit6d486fb2e77e338ac4d45ff5ed45561abb5c81b3 (patch)
treef6981f805fb9f556c2b429e0685a65a6c2d083e0 /lib/sqlalchemy
parentb640456af1895e3b1f12c1369dad16b71dc6e865 (diff)
downloadsqlalchemy-6d486fb2e77e338ac4d45ff5ed45561abb5c81b3.tar.gz
check for session is none, [ticket:940]
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/session.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 0d58a5216..e2bc71b92 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -1141,7 +1141,7 @@ def object_session(instance):
hashkey = getattr(instance, '_sa_session_id', None)
if hashkey is not None:
sess = _sessions.get(hashkey)
- if instance in sess:
+ if sess is not None and instance in sess:
return sess
return None