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

Move condition from BCall to Repl

Browse source
This commit is contained in:
Florent 2013-08-06 18:45:03 +02:00
commit 6b0930ffc5
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
weboob/core/bcall.py
View file

@ -98,8 +98,6 @@ class BackendsCall(object):
def _store_result(self, backend, result): def _store_result(self, backend, result):
with self.mutex: with self.mutex:
if isinstance(result, CapBaseObject): if isinstance(result, CapBaseObject):
if self.condition and not self.condition.is_valid(result):
return
result.backend = backend.name result.backend = backend.name
self.responses.append((backend, result)) self.responses.append((backend, result))
self.response_event.set() self.response_event.set()

3
weboob/tools/application/repl.py
View file

@ -1109,6 +1109,9 @@ class ReplApplication(Cmd, ConsoleApplication):
def format(self, result, alias=None): def format(self, result, alias=None):
fields = self.selected_fields fields = self.selected_fields
# Do not format objects if they not respect conditions
if self.condition and not self.condition.is_valid(result):
return
if '$direct' in fields or '$full' in fields: if '$direct' in fields or '$full' in fields:
fields = None fields = None
try: try: