summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/collections.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/orm/collections.py')
-rw-r--r--lib/sqlalchemy/orm/collections.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/collections.py b/lib/sqlalchemy/orm/collections.py
index a8fd912cb..714535dcc 100644
--- a/lib/sqlalchemy/orm/collections.py
+++ b/lib/sqlalchemy/orm/collections.py
@@ -954,7 +954,7 @@ def _dict_decorators():
def update(fn):
def update(self, other):
for key in other.keys():
- if not self.has_key(key) or self[key] is not other[key]:
+ if key not in self or self[key] is not other[key]:
self[key] = other[key]
_tidy(update)
return update