From 2915a04ebaf6517afe99d2fa0c54a78e34cce66c Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 6 May 2014 17:05:06 +0200 Subject: [PATCH] Do not display warning message if -n or count is set Someone using the count option is already aware of the limitations. The warning is useless. --- weboob/tools/application/base.py | 6 +++++- weboob/tools/application/repl.py | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/weboob/tools/application/base.py b/weboob/tools/application/base.py index dded9e8e..0f19cf82 100644 --- a/weboob/tools/application/base.py +++ b/weboob/tools/application/base.py @@ -162,6 +162,7 @@ class BaseApplication(object): logging_options.add_option('-a', '--save-responses', action='store_true', help='save every response') self._parser.add_option_group(logging_options) self._parser.add_option('--shell-completion', action='store_true', help=optparse.SUPPRESS_HELP) + self._is_default_count = True def deinit(self): self.weboob.want_stop() @@ -263,7 +264,10 @@ class BaseApplication(object): modif += 1 else: if count and i - modif == count: - raise MoreResultsAvailable() + if self._is_default_count: + raise MoreResultsAvailable() + else: + return yield sub def _do_complete(self, backend, count, selected_fields, function, *args, **kwargs): diff --git a/weboob/tools/application/repl.py b/weboob/tools/application/repl.py index 7cb2850e..befdfd83 100644 --- a/weboob/tools/application/repl.py +++ b/weboob/tools/application/repl.py @@ -167,7 +167,6 @@ class ReplApplication(Cmd, ConsoleApplication): self._parser.add_option_group(formatting_options) self._interactive = False - self._is_default_count = True self.working_path = WorkingPath() self._change_prompt()