cubicweb: comparison entity.py

equal deleted inserted replaced

-:2cf127d4f5fd
+:b4bcabf55e77
 from logilab.common import interface
 from logilab.common.decorators import cached
 from logilab.common.deprecation import deprecated
 from logilab.common.registry import yes
-from logilab.mtconverter import TransformData, TransformError, xml_escape
+from logilab.mtconverter import TransformData, xml_escape
 from rql.utils import rqlvar_maker
 from rql.stmts import Select
 from rql.nodes import (Not, VariableRef, Constant, make_relation,
 Relation as RqlRelation)
-from cubicweb import Unauthorized, typed_eid, neg_role
+from cubicweb import Unauthorized, neg_role
 from cubicweb.utils import support_args
 from cubicweb.rset import ResultSet
 from cubicweb.appobject import AppObject
-from cubicweb.req import _check_cw_unsafe
 from cubicweb.schema import (RQLVocabularyConstraint, RQLConstraint,
 GeneratedConstraint)
 from cubicweb.rqlrewrite import RQLRewriter
 from cubicweb.uilib import soup2xhtml
 def __repr__(self):
 return '<Entity %s %s %s at %s>' % (
 self.e_schema, self.eid, list(self.cw_attr_cache), id(self))
-def __cmp__(self, other):
+def __lt__(self, other):
+raise NotImplementedError('comparison not implemented for %s' % self.__class__)
+def __eq__(self, other):
 raise NotImplementedError('comparison not implemented for %s' % self.__class__)
 def _cw_update_attr_cache(self, attrcache):
 # if context is a repository session, don't consider dont-cache-attrs as
 # the instance already hold modified values and loosing them could
 def has_eid(self): # XXX cw_has_eid
 """return True if the entity has an attributed eid (False
 meaning that the entity has to be created
 """
 try:
-typed_eid(self.eid)
+int(self.eid)
 return True
 except (ValueError, TypeError):
 return False
 def cw_is_saved(self):
 execute = self._cw.execute
 skip_copy_for = {'subject': set(), 'object': set()}
 for rtype in self.skip_copy_for:
 skip_copy_for['subject'].add(rtype)
 warn('[3.14] skip_copy_for on entity classes (%s) is deprecated, '
-'use cw_skip_for instead with list of couples (rtype, role)' % self.__regid__,
+'use cw_skip_for instead with list of couples (rtype, role)' % self.cw_etype,
 DeprecationWarning)
 for rtype, role in self.cw_skip_copy_for:
 assert role in ('subject', 'object'), role
 skip_copy_for[role].add(rtype)
 for rschema in self.e_schema.subject_relations():
 @cached
 def as_rset(self): # XXX .cw_as_rset
 """returns a resultset containing `self` information"""
 rset = ResultSet([(self.eid,)], 'Any X WHERE X eid %(x)s',
-{'x': self.eid}, [(self.__regid__,)])
+{'x': self.eid}, [(self.cw_etype,)])
 rset.req = self._cw
 return rset
 def _cw_to_complete_relations(self):
 """by default complete final relations to when calling .complete()"""
 You can also set relations where the entity has 'object' role by
 prefixing the relation name by 'reverse_'.  Also, relation values may be
 an entity or eid, a list of entities or eids, or None (meaning that all
 relations of the given type from or to this object should be deleted).
 """
-_check_cw_unsafe(kwargs)
 assert kwargs
 assert self.cw_is_saved(), "should not call set_attributes while entity "\
 "hasn't been saved yet"
 rql, qargs, pendingrels, attrcache = self._cw_build_entity_query(kwargs)
 if rql:
 def __iter__(self):
 return iter(self.cw_attr_cache)
 @deprecated('[3.10] use entity.cw_attr_cache[attr]')
 def __getitem__(self, key):
-if key == 'eid':
-warn('[3.7] entity["eid"] is deprecated, use entity.eid instead',
-DeprecationWarning, stacklevel=2)
-return self.eid
 return self.cw_attr_cache[key]
 @deprecated('[3.10] use entity.cw_attr_cache.get(attr[, default])')
 def get(self, key, default=None):
 return self.cw_attr_cache.get(key, default)
 and this way, cw_edited will be updated accordingly. Also, add
 the attribute to skip_security since we don't want to check security
 for such attributes set by hooks.
 """
-if attr == 'eid':
+try:
-warn('[3.7] entity["eid"] = value is deprecated, use entity.eid = value instead',
+self.cw_edited[attr] = value
-DeprecationWarning, stacklevel=2)
+except AttributeError:
-self.eid = value
+self.cw_attr_cache[attr] = value
-else:
-try:
-self.cw_edited[attr] = value
-except AttributeError:
-self.cw_attr_cache[attr] = value
 @deprecated('[3.10] use del entity.cw_edited[attr]')
 def __delitem__(self, attr):
 """override __delitem__ to update self.cw_edited on cleanup of
 undesired changes introduced in the entity's dict. For example, see the

branch	stable
changeset 9013	b4bcabf55e77
parent 8992	55a1567d92a0
child 9188	0677e03077fb