diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-01-17 16:24:26 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-01-17 16:24:26 +0000 |
| commit | 6d486fb2e77e338ac4d45ff5ed45561abb5c81b3 (patch) | |
| tree | f6981f805fb9f556c2b429e0685a65a6c2d083e0 | |
| parent | b640456af1895e3b1f12c1369dad16b71dc6e865 (diff) | |
| download | sqlalchemy-6d486fb2e77e338ac4d45ff5ed45561abb5c81b3.tar.gz | |
check for session is none, [ticket:940]
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -51,6 +51,8 @@ CHANGES - fixed a rather expensive call in Query that was slowing down polymorphic queries + + - miscellaneous tickets: [ticket:940] - general - warnings are now issued as type exceptions.SAWarning. 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 |