diff -r db76e8aaec29 -r a673d1d9a738 entities/wfobjs.py --- a/entities/wfobjs.py Fri Oct 21 14:32:18 2011 +0200 +++ b/entities/wfobjs.py Fri Oct 21 14:32:37 2011 +0200 @@ -251,11 +251,6 @@ 'T condition X WHERE T eid %(x)s', kwargs) # XXX clear caches? - @deprecated('[3.6.1] use set_permission') - def set_transition_permissions(self, requiredgroups=(), conditions=(), - reset=True): - return self.set_permissions(requiredgroups, conditions, reset) - class Transition(BaseTransition): """customized class for Transition entities""" @@ -386,10 +381,6 @@ """ @property - @deprecated('[3.5] use printable_state') - def displayable_state(self): - return self._cw._(self.state) - @property @deprecated("[3.9] use entity.cw_adapt_to('IWorkflowable').main_workflow") def main_workflow(self): return self.cw_adapt_to('IWorkflowable').main_workflow @@ -414,14 +405,6 @@ def workflow_history(self): return self.cw_adapt_to('IWorkflowable').workflow_history - @deprecated('[3.5] get transition from current workflow and use its may_be_fired method') - def can_pass_transition(self, trname): - """return the Transition instance if the current user can fire the - transition with the given name, else None - """ - tr = self.current_workflow and self.current_workflow.transition_by_name(trname) - if tr and tr.may_be_fired(self.eid): - return tr @deprecated("[3.9] use entity.cw_adapt_to('IWorkflowable').cwetype_workflow()") def cwetype_workflow(self): return self.cw_adapt_to('IWorkflowable').main_workflow() @@ -607,11 +590,7 @@ if hasattr(statename, 'eid'): stateeid = statename.eid else: - if not isinstance(statename, basestring): - warn('[3.5] give a state name', DeprecationWarning, stacklevel=2) - state = self.current_workflow.state_by_eid(statename) - else: - state = self.current_workflow.state_by_name(statename) + state = self.current_workflow.state_by_name(statename) if state is None: raise WorkflowException('not a %s state: %s' % (self.__regid__, statename))