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

fix falling back to default formatter

Browse source
This commit is contained in:
Romain Bignon 2010-10-16 22:24:59 +02:00
commit 89e2c29447
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -309,10 +309,11 @@ class ReplApplication(Cmd, BaseApplication):
cmd, arg, ignored = self.parseline(line) cmd, arg, ignored = self.parseline(line)
# Set the right formatter for the command. # Set the right formatter for the command.
if cmd in self.commands_formatters: try:
self.set_formatter(self.commands_formatters[cmd]) formatter_name = self.commands_formatters[cmd]
else: except KeyError:
self.set_formatter(self.DEFAULT_FORMATTER) formatter_name = self.DEFAULT_FORMATTER
self.set_formatter(formatter_name)
try: try:
return super(ReplApplication, self).onecmd(line) return super(ReplApplication, self).onecmd(line)
@ -877,7 +878,9 @@ class ReplApplication(Cmd, BaseApplication):
self.formatter = self.formatters_loader.build_formatter(name) self.formatter = self.formatters_loader.build_formatter(name)
except FormatterLoadError, e: except FormatterLoadError, e:
print '%s' % e print '%s' % e
print 'Falling back to "%s".' % (name, self.DEFAULT_FORMATTER) if self.DEFAULT_FORMATTER == name:
self.DEFAULT_FORMATTER = ReplApplication.DEFAULT_FORMATTER
print 'Falling back to "%s".' % (self.DEFAULT_FORMATTER)
self.formatter = self.formatters_loader.build_formatter(self.DEFAULT_FORMATTER) self.formatter = self.formatters_loader.build_formatter(self.DEFAULT_FORMATTER)
name = self.DEFAULT_FORMATTER name = self.DEFAULT_FORMATTER
if self.options.no_header: if self.options.no_header: