diff --git a/weboob/capabilities/messages.py b/weboob/capabilities/messages.py index 4e7610db..4a99352c 100644 --- a/weboob/capabilities/messages.py +++ b/weboob/capabilities/messages.py @@ -77,7 +77,7 @@ class Message(CapBaseObject): @property def full_parent_id(self): if self.parent: - return self.parent.full_id() + return self.parent.full_id elif self._parent_id is None: return '' elif self._parent_id is NotLoaded: diff --git a/weboob/tools/application/console.py b/weboob/tools/application/console.py index 0d8307af..8b189fe5 100644 --- a/weboob/tools/application/console.py +++ b/weboob/tools/application/console.py @@ -123,7 +123,7 @@ class ConsoleApplication(BaseApplication): print '%sq)%s --stop--\n' % (self.BOLD, self.NC) r = self.ask('Select a backend to add (q to stop)', regexp='^(\d+|q)$') - if r.isdigit(): + if str(r).isdigit(): i = int(r) - 1 if i < 0 or i >= len(backends): print >>sys.stderr, 'Error: %s is not a valid choice' % r @@ -178,13 +178,11 @@ class ConsoleApplication(BaseApplication): for index, (name, backend) in enumerate(backends): print '%s%d)%s %s%-15s%s %s' % (self.BOLD, index + 1, self.NC, self.BOLD, name, self.NC, backend.description) - response = self.ask('Select a backend to proceed', regexp='^\d+$') - if response.isdigit(): - i = int(response) - 1 - if i < 0 or i >= len(backends): - print >>sys.stderr, 'Error: %s is not a valid choice' % response - continue - backend_name = backends[i][0] + i = int(self.ask('Select a backend to proceed', regexp='^\d+$')) + if i < 0 or i >= len(backends): + print >>sys.stderr, 'Error: %s is not a valid choice' % i + continue + backend_name = backends[i][0] else: raise BackendNotGiven('Please specify a backend to use for this argument (%s@backend_name). ' 'Availables: %s.' % (_id, ', '.join(name for name, backend in backends))) diff --git a/weboob/tools/backend.py b/weboob/tools/backend.py index 54d1463f..1331844a 100644 --- a/weboob/tools/backend.py +++ b/weboob/tools/backend.py @@ -74,8 +74,6 @@ class BaseBackend(object): DESCRIPTION = '' # License of this backend. LICENSE = '' - # Icon file path - ICON = None # Configuration required for this backend. # Values must be weboob.tools.value.Value objects. CONFIG = {}