summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/identity.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/orm/identity.py')
-rw-r--r--lib/sqlalchemy/orm/identity.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/identity.py b/lib/sqlalchemy/orm/identity.py
index 4425fc3a6..0fa541194 100644
--- a/lib/sqlalchemy/orm/identity.py
+++ b/lib/sqlalchemy/orm/identity.py
@@ -181,7 +181,10 @@ class WeakInstanceDict(IdentityMap):
return iter(self.values())
def all_states(self):
- return self._dict.values()
+ if util.py2k:
+ return self._dict.values()
+ else:
+ return list(self._dict.values())
def discard(self, state):
if state.key in self._dict: