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.py14
1 files changed, 1 insertions, 13 deletions
diff --git a/lib/sqlalchemy/orm/identity.py b/lib/sqlalchemy/orm/identity.py
index 6aea0d185..10d924b48 100644
--- a/lib/sqlalchemy/orm/identity.py
+++ b/lib/sqlalchemy/orm/identity.py
@@ -9,7 +9,6 @@ import weakref
from . import util as orm_util
from .. import exc as sa_exc
-from .. import util
class IdentityMap(object):
@@ -201,19 +200,8 @@ class WeakInstanceDict(IdentityMap):
def __iter__(self):
return iter(self.keys())
- if util.py2k:
-
- def iteritems(self):
- return iter(self.items())
-
- def itervalues(self):
- return iter(self.values())
-
def all_states(self):
- if util.py2k:
- return self._dict.values()
- else:
- return list(self._dict.values())
+ return list(self._dict.values())
def _fast_discard(self, state):
# used by InstanceState for state being