diff options
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/__init__.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/attributes.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/collections.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 14 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 18 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/strategies.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/unitofwork.py | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/util.py | 4 |
8 files changed, 25 insertions, 25 deletions
diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py index fb9e812e1..9316fca00 100644 --- a/lib/sqlalchemy/orm/__init__.py +++ b/lib/sqlalchemy/orm/__init__.py @@ -617,7 +617,7 @@ def contains_alias(alias): selectable = self.get_selectable(mapper) for c in mapper.mapped_table.c: c2 = selectable.corresponding_column(c, keys_ok=True, raiseerr=False) - if c2 and row.has_key(c2): + if c2 and c2 in row: newrow[c] = row[c2] return newrow diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py index c9dfc7fce..23af66242 100644 --- a/lib/sqlalchemy/orm/attributes.py +++ b/lib/sqlalchemy/orm/attributes.py @@ -556,7 +556,7 @@ class CommittedState(object): def rollback(self, manager, obj): for attr in manager.managed_attributes(obj.__class__): - if self.data.has_key(attr.key): + if attr.key in self.data: if not isinstance(attr, InstrumentedCollectionAttribute): obj.__dict__[attr.key] = self.data[attr.key] else: 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 diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 86e5d3387..1f24e8d90 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -573,15 +573,15 @@ class Mapper(object): if self.inherits is not None: for key, prop in self.inherits.__props.iteritems(): - if not self.__props.has_key(key): + if key not in self.__props: self._adapt_inherited_property(key, prop) # load properties from the main table object, # not overriding those set up in the 'properties' argument for column in self.mapped_table.columns: - if self.columntoproperty.has_key(column): + if column in self.columntoproperty: continue - if not self.columns.has_key(column.key): + if column.key not in self.columns: self.columns[column.key] = self.select_table.corresponding_column(column, keys_ok=True, raiseerr=True) column_key = (self.column_prefix or '') + column.key @@ -675,7 +675,7 @@ class Mapper(object): if self.non_primary: return - if not self.non_primary and (mapper_registry.has_key(self.class_key)): + if not self.non_primary and (self.class_key in mapper_registry): raise exceptions.ArgumentError("Class '%s' already has a primary mapper defined with entity name '%s'. Use non_primary=True to create a non primary Mapper, or to create a new primary mapper, remove this mapper first via sqlalchemy.orm.clear_mapper(mapper), or preferably sqlalchemy.orm.clear_mappers() to clear all mappers." % (self.class_, self.entity_name)) attribute_manager.reset_class_managed(self.class_) @@ -1289,7 +1289,7 @@ class Mapper(object): if not pk: return False for k in pk: - if not self.columntoproperty.has_key(k): + if k not in self.columntoproperty: return False else: return True @@ -1410,7 +1410,7 @@ class Mapper(object): raise exceptions.ConcurrentModificationError("Instance '%s' version of %s does not match %s" % (instance, self.get_attr_by_column(instance, self.version_id_col), row[self.version_id_col])) if populate_existing or context.session.is_expired(instance, unexpire=True): - if not context.identity_map.has_key(identitykey): + if identitykey not in context.identity_map: context.identity_map[identitykey] = instance isnew = True if extension.populate_instance(self, context, row, instance, instancekey=identitykey, isnew=isnew) is EXT_CONTINUE: @@ -1498,7 +1498,7 @@ class Mapper(object): newrow = util.DictDecorator(row) for c in tomapper.mapped_table.c: c2 = self.mapped_table.corresponding_column(c, keys_ok=True, raiseerr=False) - if c2 and row.has_key(c2): + if c2 and c2 in row: newrow[c] = row[c2] return newrow diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 7e9b351e1..c1e0e5b65 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -158,7 +158,7 @@ class SessionTransaction(object): if self.__parent is not None: return self.__parent.add(bind) - if self.__connections.has_key(bind.engine): + if bind.engine in self.__connections: raise exceptions.InvalidRequestError("Session already has a Connection associated for the given %sEngine" % (isinstance(bind, engine.Connection) and "Connection's " or "")) return self.get_or_add(bind) @@ -173,14 +173,14 @@ class SessionTransaction(object): if not self.nested: return self.__parent.get_or_add(bind) - if self.__connections.has_key(bind): + if bind in self.__connections: return self.__connections[bind][0] if bind in self.__parent._connection_dict(): (conn, trans, autoclose) = self.__parent.__connections[bind] self.__connections[conn] = self.__connections[bind.engine] = (conn, conn.begin_nested(), autoclose) return conn - elif self.__connections.has_key(bind): + elif bind in self.__connections: return self.__connections[bind][0] if not isinstance(bind, engine.Connection): @@ -610,9 +610,9 @@ class Session(object): if mapper is not None: if isinstance(mapper, type): mapper = _class_mapper(mapper) - if self.__binds.has_key(mapper.base_mapper): + if mapper.base_mapper in self.__binds: return self.__binds[mapper.base_mapper] - elif self.__binds.has_key(mapper.compile().mapped_table): + elif mapper.compile().mapped_table in self.__binds: return self.__binds[mapper.mapped_table] if clause is not None: for t in clause._table_iterator(): @@ -931,7 +931,7 @@ class Session(object): def _save_impl(self, object, **kwargs): if hasattr(object, '_instance_key'): - if not self.identity_map.has_key(object._instance_key): + if object._instance_key not in self.identity_map: raise exceptions.InvalidRequestError("Instance '%s' is a detached instance " "or is already persistent in a " "different Session" % repr(object)) @@ -972,7 +972,7 @@ class Session(object): old_id = getattr(obj, '_sa_session_id', None) if old_id != self.hash_key: - if old_id is not None and _sessions.has_key(old_id): + if old_id is not None and old_id in _sessions: raise exceptions.InvalidRequestError("Object '%s' is already attached " "to session '%s' (this is '%s')" % (repr(obj), old_id, id(self))) @@ -1013,7 +1013,7 @@ class Session(object): result of True. """ - return self._is_attached(obj) and (obj in self.uow.new or self.identity_map.has_key(obj._instance_key)) + return self._is_attached(obj) and (obj in self.uow.new or obj._instance_key in self.identity_map) def __iter__(self): """return an iterator of all objects which are pending or persistent within this Session.""" @@ -1026,7 +1026,7 @@ class Session(object): def has_key(self, key): """return True if the given identity key is present within this Session's identity map.""" - return self.identity_map.has_key(key) + return key in self.identity_map dirty = property(lambda s:s.uow.locate_dirty(), doc="A ``Set`` of all objects marked as 'dirty' within this ``Session``") diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index f2bc93d3a..6565c8d77 100644 --- a/lib/sqlalchemy/orm/strategies.py +++ b/lib/sqlalchemy/orm/strategies.py @@ -537,7 +537,7 @@ class EagerLoader(AbstractRelationLoader): #print "creating row decorator for path ", "->".join([str(s) for s in path]) # check for a user-defined decorator in the SelectContext (which was set up by the contains_eager() option) - if selectcontext.attributes.has_key(("eager_row_processor", self.parent_property)): + if ("eager_row_processor", self.parent_property) in selectcontext.attributes: # custom row decoration function, placed in the selectcontext by the # contains_eager() mapper option decorator = selectcontext.attributes[("eager_row_processor", self.parent_property)] diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py index 7acb26341..9cf3da639 100644 --- a/lib/sqlalchemy/orm/unitofwork.py +++ b/lib/sqlalchemy/orm/unitofwork.py @@ -116,12 +116,12 @@ class UnitOfWork(object): pass def _validate_obj(self, obj): - if (hasattr(obj, '_instance_key') and not self.identity_map.has_key(obj._instance_key)) or \ + if (hasattr(obj, '_instance_key') and obj._instance_key not in self.identity_map) or \ (not hasattr(obj, '_instance_key') and obj not in self.new): raise exceptions.InvalidRequestError("Instance '%s' is not attached or pending within this session" % repr(obj)) def _is_valid(self, obj): - if (hasattr(obj, '_instance_key') and not self.identity_map.has_key(obj._instance_key)) or \ + if (hasattr(obj, '_instance_key') and obj._instance_key not in self.identity_map) or \ (not hasattr(obj, '_instance_key') and obj not in self.new): return False else: @@ -799,7 +799,7 @@ class UOWTask(object): parenttask.append(None, listonly=False, isdelete=originating_task._objects[node.item].isdelete, childtask=t) t.append(node.item, originating_task._objects[node.item].listonly, isdelete=originating_task._objects[node.item].isdelete) - if dependencies.has_key(node.item): + if node.item in dependencies: for depprocessor, deptask in dependencies[node.item].iteritems(): t.cyclical_dependencies.add(depprocessor.branch(deptask)) nd = {} diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py index e9fe6ac4e..6b0956dc4 100644 --- a/lib/sqlalchemy/orm/util.py +++ b/lib/sqlalchemy/orm/util.py @@ -99,13 +99,13 @@ class TranslatingDict(dict): return super(TranslatingDict, self).__getitem__(self.__translate_col(col)) def has_key(self, col): - return super(TranslatingDict, self).has_key(self.__translate_col(col)) + return col in self def __setitem__(self, col, value): return super(TranslatingDict, self).__setitem__(self.__translate_col(col), value) def __contains__(self, col): - return self.has_key(col) + return super(TranslatingDict, self).__contains__(self.__translate_col(col)) def setdefault(self, col, value): return super(TranslatingDict, self).setdefault(self.__translate_col(col), value) |