diff -r 63ba0a669c4f -r 4c92cd09882f entities/wfobjs.py --- a/entities/wfobjs.py Thu Oct 01 09:41:34 2009 +0200 +++ b/entities/wfobjs.py Thu Oct 01 09:41:41 2009 +0200 @@ -222,9 +222,10 @@ if isinstance(conditions, basestring): conditions = (conditions,) for expr in conditions: - if isinstance(expr, str): + if isinstance(expr, basestring): kwargs = {'expr': unicode(expr)} - elif isinstance(expr, dict): + else: + assert isinstance(expr, dict) kwargs = expr kwargs['x'] = self.eid kwargs.setdefault('mainvars', u'X')