diff --git a/weboob/frontends/boobank/boobank.py b/weboob/frontends/boobank/boobank.py index 6d739277..fe2e52bc 100644 --- a/weboob/frontends/boobank/boobank.py +++ b/weboob/frontends/boobank/boobank.py @@ -3,16 +3,16 @@ # vim: ft=python et softtabstop=4 cinoptions=4 shiftwidth=4 ts=4 ai # Copyright(C) 2009-2010 Romain Bignon, Christophe Benz -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, version 3 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -42,7 +42,7 @@ class Boobank(ConsoleApplication): def command_list(self): try: for backend, account in self.weboob.do('iter_accounts'): - self.format(account) + self.format(account, backend.name) except weboob.CallErrors, errors: for backend, error, backtrace in errors: if isinstance(error, weboob.tools.browser.BrowserIncorrectPassword): @@ -60,7 +60,7 @@ class Boobank(ConsoleApplication): try: for backend, operation in self.weboob.do(do): - self.format(operation) + self.format(operation, backend.name) total += operation.amount except weboob.CallErrors, errors: for backend, error, backtrace in errors: diff --git a/weboob/frontends/weboorrents/weboorrents.py b/weboob/frontends/weboorrents/weboorrents.py index 20e778eb..fffa47b5 100644 --- a/weboob/frontends/weboorrents/weboorrents.py +++ b/weboob/frontends/weboorrents/weboorrents.py @@ -1,22 +1,19 @@ # -*- coding: utf-8 -*- -""" -Copyright(C) 2010 Romain Bignon - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -""" +# Copyright(C) 2010 Romain Bignon +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from __future__ import with_statement @@ -62,7 +59,7 @@ class Weboorrents(ConsoleApplication): if not torrent: logging.error('Torrent "%s" not found' % id) return 1 - self.format(torrent) + self.format(torrent, backend.name) @ConsoleApplication.command('Get the torrent file') def command_getfile(self, id, dest): @@ -86,4 +83,4 @@ class Weboorrents(ConsoleApplication): def command_search(self, pattern=None): print u'Search pattern: %s' % pattern if pattern else u'Last torrents' for backend, torrent in self.weboob.do('iter_torrents', pattern=pattern): - self.format(torrent) + self.format(torrent, backend.name) diff --git a/weboob/frontends/wetboobs/wetboobs.py b/weboob/frontends/wetboobs/wetboobs.py index af30e872..dbb3a748 100644 --- a/weboob/frontends/wetboobs/wetboobs.py +++ b/weboob/frontends/wetboobs/wetboobs.py @@ -1,22 +1,19 @@ # -*- coding: utf-8 -*- -""" -Copyright(C) 2010 Romain Bignon - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -""" +# Copyright(C) 2010 Romain Bignon +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. import logging @@ -41,13 +38,13 @@ class WetBoobs(ConsoleApplication): @ConsoleApplication.command('search cities') def command_search(self, pattern): for backend, city in self.weboob.do('iter_city_search', pattern): - self.format(city) + self.format(city, backend.name) @ConsoleApplication.command('get current weather') def command_current(self, city): try: for backend, current in self.weboob.do('get_current', city): - self.format(current) + self.format(current, backend.name) except CallErrors, e: for error in e: if isinstance(error, CityNotFound): @@ -59,7 +56,7 @@ class WetBoobs(ConsoleApplication): def command_forecasts(self, city): try: for backend, forecast in self.weboob.do('iter_forecast', city): - self.format(forecast) + self.format(forecast, backend.name) except CallErrors, e: for error in e: if isinstance(error, CityNotFound):