From 38a8fd00b77af809038cd7e9a6f972a51ae8e707 Mon Sep 17 00:00:00 2001 From: Florent Date: Wed, 18 Jun 2014 15:35:19 +0200 Subject: [PATCH] Introduce parse_fields function --- weboob/tools/application/repl.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/weboob/tools/application/repl.py b/weboob/tools/application/repl.py index c4bdac51..4b3464b7 100644 --- a/weboob/tools/application/repl.py +++ b/weboob/tools/application/repl.py @@ -340,10 +340,7 @@ class ReplApplication(Cmd, ConsoleApplication): if not fields and fields != []: fields = self.selected_fields - if '$direct' in fields: - fields = [] - elif '$full' in fields: - fields = None + fields = self.parse_fields(fields) if fields and self.formatter.MANDATORY_FIELDS is not None: missing_fields = set(self.formatter.MANDATORY_FIELDS) - set(fields) @@ -1246,12 +1243,15 @@ class ReplApplication(Cmd, ConsoleApplication): alias = '%s' % len(self.objects) self.format(obj, alias=alias) - def format(self, result, alias=None): - fields = self.selected_fields + def parse_fields(self, fields): if '$direct' in fields: - fields = [] - elif '$full' in fields: - fields = None + return [] + if '$full' in fields: + return None + return fields + + def format(self, result, alias=None): + fields = self.parse_fields(self.selected_fields) try: self.formatter.format(obj=result, selected_fields=fields, alias=alias) except FieldNotFound as e: