nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix OR condition

Browse source 
Return True at the first True result, return False if no condition
match

Closes #1288
This commit is contained in:
Florent 2013-08-05 15:55:48 +02:00
commit 4dbe7b8c5d
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
weboob/tools/application/results.py
View file

@ -58,14 +58,14 @@ class ResultsCondition(IResultsCondition):
different = False different = False
if k in d: if k in d:
if different: if different:
if d[k] == v:
return False
else:
if d[k] != v: if d[k] != v:
return False return True
else:
if d[k] == v:
return True
else: else:
raise ResultsConditionError(u'Field "%s" is not valid.' % k) raise ResultsConditionError(u'Field "%s" is not valid.' % k)
return True return False
def __str__(self): def __str__(self):
return unicode(self).encode('utf-8') return unicode(self).encode('utf-8')