summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/state.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-08-29 13:11:52 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-08-29 13:11:52 -0400
commit9d25eae8eec8c090339a01c03445bdf04a0840f5 (patch)
treed2184236c405081be62635264719b2971415adf9 /lib/sqlalchemy/orm/state.py
parenta95b0a5b6e132e44bcc9cc4429526533ab964787 (diff)
downloadsqlalchemy-9d25eae8eec8c090339a01c03445bdf04a0840f5.tar.gz
- use a faster discard when loading
- don't do a bool on identity map since it calls __len__
Diffstat (limited to 'lib/sqlalchemy/orm/state.py')
-rw-r--r--lib/sqlalchemy/orm/state.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py
index fe8ccd222..17872a9b4 100644
--- a/lib/sqlalchemy/orm/state.py
+++ b/lib/sqlalchemy/orm/state.py
@@ -58,7 +58,6 @@ class InstanceState(interfaces.InspectionAttr):
expired = False
deleted = False
_load_pending = False
-
is_instance = True
def __init__(self, obj, manager):
@@ -221,7 +220,7 @@ class InstanceState(interfaces.InspectionAttr):
def _cleanup(self, ref):
instance_dict = self._instance_dict()
- if instance_dict:
+ if instance_dict is not None:
instance_dict.discard(self)
self.callables.clear()