diff options
author | Brian Jarrett <celttechie@gmail.com> | 2014-07-20 12:44:40 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-07-20 12:44:40 -0400 |
commit | cca03097f47f22783d42d1853faac6cf84607c5a (patch) | |
tree | 4fe1a63d03a2d88d1cf37e1167759dfaf84f4ce7 /lib/sqlalchemy/orm/identity.py | |
parent | 827329a0cca5351094a1a86b6b2be2b9182f0ae2 (diff) | |
download | sqlalchemy-cca03097f47f22783d42d1853faac6cf84607c5a.tar.gz |
- apply pep8 formatting to sqlalchemy/sql, sqlalchemy/util, sqlalchemy/dialects,
sqlalchemy/orm, sqlalchemy/event, sqlalchemy/testing
Diffstat (limited to 'lib/sqlalchemy/orm/identity.py')
-rw-r--r-- | lib/sqlalchemy/orm/identity.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/identity.py b/lib/sqlalchemy/orm/identity.py index 745b9d569..d9cdd791f 100644 --- a/lib/sqlalchemy/orm/identity.py +++ b/lib/sqlalchemy/orm/identity.py @@ -9,6 +9,7 @@ import weakref from . import attributes from .. import util + class IdentityMap(object): def __init__(self): self._dict = {} @@ -237,7 +238,6 @@ class StrongInstanceDict(IdentityMap): def items(self): return self._dict.items() - def all_states(self): return [attributes.instance_state(o) for o in self.values()] @@ -262,8 +262,8 @@ class StrongInstanceDict(IdentityMap): if state.key in self: if attributes.instance_state(self._dict[state.key]) is not state: raise AssertionError('A conflicting state is already ' - 'present in the identity map for key %r' - % (state.key, )) + 'present in the identity map for key %r' + % (state.key, )) else: self._dict[state.key] = state.obj() self._manage_incoming_state(state) |