cubicweb: comparison entities/adapters.py

equal deleted inserted replaced

-:46f41c3e1443
+:697a8181ba30
 from logilab.mtconverter import TransformError
 from logilab.common.decorators import cached
 from cubicweb import ValidationError, view
-from cubicweb.predicates import (implements, is_instance, relation_possible,
+from cubicweb.predicates import is_instance, relation_possible, match_exception
-match_exception)
-from cubicweb.interfaces import IDownloadable, ITree
 class IEmailableAdapter(view.EntityAdapter):
 __regid__ = 'IEmailable'
 __select__ = relation_possible('primary_email') | relation_possible('use_email')
 return dict( (attr, getattr(self.entity, attr))
 for attr in self.allowed_massmail_keys() )
 class INotifiableAdapter(view.EntityAdapter):
-__needs_bw_compat__ = True
 __regid__ = 'INotifiable'
 __select__ = is_instance('Any')
-@view.implements_adapter_compat('INotifiableAdapter')
 def notification_references(self, view):
 """used to control References field of email send on notification
 for this entity. `view` is the notification view.
 Should return a list of eids which can be used to generate message
 for weight, words in newdict.iteritems():
 maindict.setdefault(weight, []).extend(words)
 class IDownloadableAdapter(view.EntityAdapter):
 """interface for downloadable entities"""
-__needs_bw_compat__ = True
 __regid__ = 'IDownloadable'
-__select__ = implements(IDownloadable, warn=False) # XXX for bw compat, else should be abstract
+__abstract__ = True
-@view.implements_adapter_compat('IDownloadable')
 def download_url(self, **kwargs): # XXX not really part of this interface
 """return an url to download entity's content"""
 raise NotImplementedError
-@view.implements_adapter_compat('IDownloadable')
 def download_content_type(self):
 """return MIME type of the downloadable content"""
 raise NotImplementedError
-@view.implements_adapter_compat('IDownloadable')
 def download_encoding(self):
 """return encoding of the downloadable content"""
 raise NotImplementedError
-@view.implements_adapter_compat('IDownloadable')
 def download_file_name(self):
 """return file name of the downloadable content"""
 raise NotImplementedError
-@view.implements_adapter_compat('IDownloadable')
 def download_data(self):
 """return actual data of the downloadable content"""
 raise NotImplementedError
 # XXX should propose to use two different relations for children/parent
 .. automethod: different_type_children
 .. automethod: same_type_children
 .. automethod: children_rql
 .. automethod: path
 """
-__needs_bw_compat__ = True
 __regid__ = 'ITree'
-__select__ = implements(ITree, warn=False) # XXX for bw compat, else should be abstract
+__abstract__ = True
 child_role = 'subject'
 parent_role = 'object'
-@property
-def tree_relation(self):
-warn('[3.9] tree_attribute is deprecated, define tree_relation on a custom '
-'ITree for %s instead' % (self.entity.__class__),
-DeprecationWarning)
-return self.entity.tree_attribute
-# XXX should be removed from the public interface
-@view.implements_adapter_compat('ITree')
 def children_rql(self):
 """Returns RQL to get the children of the entity."""
 return self.entity.cw_related_rql(self.tree_relation, self.parent_role)
-@view.implements_adapter_compat('ITree')
 def different_type_children(self, entities=True):
 """Return children entities of different type as this entity.
 According to the `entities` parameter, return entity objects or the
 equivalent result set.
 eschema = self.entity.e_schema
 if entities:
 return [e for e in res if e.e_schema != eschema]
 return res.filtered_rset(lambda x: x.e_schema != eschema, self.entity.cw_col)
-@view.implements_adapter_compat('ITree')
 def same_type_children(self, entities=True):
 """Return children entities of the same type as this entity.
 According to the `entities` parameter, return entity objects or the
 equivalent result set.
 eschema = self.entity.e_schema
 if entities:
 return [e for e in res if e.e_schema == eschema]
 return res.filtered_rset(lambda x: x.e_schema is eschema, self.entity.cw_col)
-@view.implements_adapter_compat('ITree')
 def is_leaf(self):
 """Returns True if the entity does not have any children."""
 return len(self.children()) == 0
-@view.implements_adapter_compat('ITree')
 def is_root(self):
 """Returns true if the entity is root of the tree (e.g. has no parent).
 """
 return self.parent() is None
-@view.implements_adapter_compat('ITree')
 def root(self):
 """Return the root entity of the tree."""
 return self._cw.entity_from_eid(self.path()[0])
-@view.implements_adapter_compat('ITree')
 def parent(self):
 """Returns the parent entity if any, else None (e.g. if we are on the
 root).
 """
 try:
 return self.entity.related(self.tree_relation, self.child_role,
 entities=True)[0]
 except (KeyError, IndexError):
 return None
-@view.implements_adapter_compat('ITree')
 def children(self, entities=True, sametype=False):
 """Return children entities.
 According to the `entities` parameter, return entity objects or the
 equivalent result set.
 return self.same_type_children(entities)
 else:
 return self.entity.related(self.tree_relation, self.parent_role,
 entities=entities)
-@view.implements_adapter_compat('ITree')
 def iterparents(self, strict=True):
 """Return an iterator on the parents of the entity."""
 def _uptoroot(self):
 curr = self
 while True:
 curr = curr.cw_adapt_to('ITree')
 if not strict:
 return chain([self.entity], _uptoroot(self))
 return _uptoroot(self)
-@view.implements_adapter_compat('ITree')
 def iterchildren(self, _done=None):
 """Return an iterator over the item's children."""
 if _done is None:
 _done = set()
 for child in self.children():
 self.error('loop in %s tree: %s', child.cw_etype.lower(), child)
 continue
 yield child
 _done.add(child.eid)
-@view.implements_adapter_compat('ITree')
 def prefixiter(self, _done=None):
 """Return an iterator over the item's descendants in a prefixed order."""
 if _done is None:
 _done = set()
 if self.entity.eid in _done:
 yield self.entity
 for child in self.same_type_children():
 for entity in child.cw_adapt_to('ITree').prefixiter(_done):
 yield entity
-@view.implements_adapter_compat('ITree')
 @cached
 def path(self):
 """Returns the list of eids from the root object to this object."""
 path = []
 adapter = self

changeset 9256	697a8181ba30
parent 9130	0f1504a9fb51
child 9375	8e88576787c3