cubicweb: comparison entities/wfobjs.py

equal deleted inserted replaced

-:73760bbb66bd
+:78438ad513ca
 # state / transitions accessors ############################################
 def state_by_name(self, statename):
 rset = self._cw.execute('Any S, SN WHERE S name SN, S name %(n)s, '
 'S state_of WF, WF eid %(wf)s',
-{'n': statename, 'wf': self.eid}, 'wf')
+{'n': statename, 'wf': self.eid})
 if rset:
 return rset.get_entity(0, 0)
 return None
 def state_by_eid(self, eid):
 rset = self._cw.execute('Any S, SN WHERE S name SN, S eid %(s)s, '
 'S state_of WF, WF eid %(wf)s',
-{'s': eid, 'wf': self.eid}, ('wf', 's'))
+{'s': eid, 'wf': self.eid})
 if rset:
 return rset.get_entity(0, 0)
 return None
 def transition_by_name(self, trname):
 rset = self._cw.execute('Any T, TN WHERE T name TN, T name %(n)s, '
 'T transition_of WF, WF eid %(wf)s',
-{'n': trname, 'wf': self.eid}, 'wf')
+{'n': trname, 'wf': self.eid})
 if rset:
 return rset.get_entity(0, 0)
 return None
 def transition_by_eid(self, eid):
 rset = self._cw.execute('Any T, TN WHERE T name TN, T eid %(t)s, '
 'T transition_of WF, WF eid %(wf)s',
-{'t': eid, 'wf': self.eid}, ('wf', 't'))
+{'t': eid, 'wf': self.eid})
 if rset:
 return rset.get_entity(0, 0)
 return None
 # wf construction methods ##################################################
 def add_state(self, name, initial=False, **kwargs):
 """add a state to this workflow"""
 state = self._cw.create_entity('State', name=unicode(name), **kwargs)
 self._cw.execute('SET S state_of WF WHERE S eid %(s)s, WF eid %(wf)s',
-{'s': state.eid, 'wf': self.eid}, ('s', 'wf'))
+{'s': state.eid, 'wf': self.eid})
 if initial:
 assert not self.initial, "Initial state already defined as %s" % self.initial
 self._cw.execute('SET WF initial_state S '
 'WHERE S eid %(s)s, WF eid %(wf)s',
-{'s': state.eid, 'wf': self.eid}, ('s', 'wf'))
+{'s': state.eid, 'wf': self.eid})
 return state
 def _add_transition(self, trtype, name, fromstates,
 requiredgroups=(), conditions=(), **kwargs):
 tr = self._cw.create_entity(trtype, name=unicode(name), **kwargs)
 self._cw.execute('SET T transition_of WF '
 'WHERE T eid %(t)s, WF eid %(wf)s',
-{'t': tr.eid, 'wf': self.eid}, ('t', 'wf'))
+{'t': tr.eid, 'wf': self.eid})
 assert fromstates, fromstates
 if not isinstance(fromstates, (tuple, list)):
 fromstates = (fromstates,)
 for state in fromstates:
 if hasattr(state, 'eid'):
 state = state.eid
 self._cw.execute('SET S allowed_transition T '
 'WHERE S eid %(s)s, T eid %(t)s',
-{'s': state, 't': tr.eid}, ('s', 't'))
+{'s': state, 't': tr.eid})
 tr.set_permissions(requiredgroups, conditions, reset=False)
 return tr
 def add_transition(self, name, fromstates, tostate=None,
 requiredgroups=(), conditions=(), **kwargs):
 if tostate is not None:
 if hasattr(tostate, 'eid'):
 tostate = tostate.eid
 self._cw.execute('SET T destination_state S '
 'WHERE S eid %(s)s, T eid %(t)s',
-{'t': tr.eid, 's': tostate}, ('s', 't'))
+{'t': tr.eid, 's': tostate})
 return tr
 def add_wftransition(self, name, subworkflow, fromstates, exitpoints=(),
 requiredgroups=(), conditions=(), **kwargs):
 """add a workflow transition to this workflow"""
 tr = self._add_transition('WorkflowTransition', name, fromstates,
 requiredgroups, conditions, **kwargs)
 if hasattr(subworkflow, 'eid'):
 subworkflow = subworkflow.eid
 assert self._cw.execute('SET T subworkflow WF WHERE WF eid %(wf)s,T eid %(t)s',
-{'t': tr.eid, 'wf': subworkflow}, ('wf', 't'))
+{'t': tr.eid, 'wf': subworkflow})
 for fromstate, tostate in exitpoints:
 tr.add_exit_point(fromstate, tostate)
 return tr
 def replace_state(self, todelstate, replacement):
 if not hasattr(todelstate, 'eid'):
 todelstate = self.state_by_name(todelstate)
 if not hasattr(replacement, 'eid'):
 replacement = self.state_by_name(replacement)
 execute = self._cw.execute
-execute('SET X in_state S WHERE S eid %(s)s', {'s': todelstate.eid}, 's')
+execute('SET X in_state S WHERE S eid %(s)s', {'s': todelstate.eid})
 execute('SET X from_state NS WHERE X to_state OS, OS eid %(os)s, NS eid %(ns)s',
-{'os': todelstate.eid, 'ns': replacement.eid}, 's')
+{'os': todelstate.eid, 'ns': replacement.eid})
 execute('SET X to_state NS WHERE X to_state OS, OS eid %(os)s, NS eid %(ns)s',
-{'os': todelstate.eid, 'ns': replacement.eid}, 's')
+{'os': todelstate.eid, 'ns': replacement.eid})
 todelstate.delete()
 class BaseTransition(AnyEntity):
 """customized class for abstract transition
 """set or add (if `reset` is False) groups and conditions for this
 transition
 """
 if reset:
 self._cw.execute('DELETE T require_group G WHERE T eid %(x)s',
-{'x': self.eid}, 'x')
+{'x': self.eid})
 self._cw.execute('DELETE T condition R WHERE T eid %(x)s',
-{'x': self.eid}, 'x')
+{'x': self.eid})
 for gname in requiredgroups:
 rset = self._cw.execute('SET T require_group G '
 'WHERE T eid %(x)s, G name %(gn)s',
-{'x': self.eid, 'gn': gname}, 'x')
+{'x': self.eid, 'gn': gname})
 assert rset, '%s is not a known group' % gname
 if isinstance(conditions, basestring):
 conditions = (conditions,)
 for expr in conditions:
 if isinstance(expr, basestring):
 kwargs = expr
 kwargs['x'] = self.eid
 kwargs.setdefault('mainvars', u'X')
 self._cw.execute('INSERT RQLExpression X: X exprtype "ERQLExpression", '
 'X expression %(expr)s, X mainvars %(mainvars)s, '
-'T condition X WHERE T eid %(x)s',kwargs, 'x')
+'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):
 if hasattr(fromstate, 'eid'):
 fromstate = fromstate.eid
 if tostate is None:
 self._cw.execute('INSERT SubWorkflowExitPoint X: T subworkflow_exit X, '
 'X subworkflow_state FS WHERE T eid %(t)s, FS eid %(fs)s',
-{'t': self.eid, 'fs': fromstate}, ('t', 'fs'))
+{'t': self.eid, 'fs': fromstate})
 else:
 if hasattr(tostate, 'eid'):
 tostate = tostate.eid
 self._cw.execute('INSERT SubWorkflowExitPoint X: T subworkflow_exit X, '
 'X subworkflow_state FS, X destination_state TS '
 'WHERE T eid %(t)s, FS eid %(fs)s, TS eid %(ts)s',
-{'t': self.eid, 'fs': fromstate, 'ts': tostate},
+{'t': self.eid, 'fs': fromstate, 'ts': tostate})
-('t', 'fs', 'ts'))
 def get_exit_point(self, entity, stateeid):
 """if state is an exit point, return its associated destination state"""
 if hasattr(stateeid, 'eid'):
 stateeid = stateeid.eid
 rset = self._cw.execute(
 'Any T,TT, TN WHERE S allowed_transition T, S eid %(x)s, '
 'T type TT, T type %(type)s, '
 'T name TN, T transition_of WF, WF eid %(wfeid)s',
 {'x': self.current_state.eid, 'type': type,
-'wfeid': self.current_workflow.eid}, 'x')
+'wfeid': self.current_workflow.eid})
 for tr in rset.entities():
 if tr.may_be_fired(self.eid):
 yield tr
 def _add_trinfo(self, comment, commentformat, treid=None, tseid=None):

changeset 5174	78438ad513ca
parent 4835	13b0b96d7982
child 5224	34e669b6fd95