diff --git a/scripts/monboob b/scripts/monboob index 2d0ee9d0aaaacfe0e81f220c8af27b1a01ba52d5..8f3bc29e320788af3d302d7b6d4a72830b002e3c 100755 --- a/scripts/monboob +++ b/scripts/monboob @@ -96,7 +96,7 @@ class Monboob(ConsoleApplication): self.weboob.loop() def process(self): - for name, backend in self.weboob.iter_backends(): + for backend in self.weboob.iter_backends(): for message in backend.iter_new_messages(): self.send_email(backend, message) diff --git a/weboob/frontends/boobank/boobank.py b/weboob/frontends/boobank/boobank.py index 4ba8fd9289829deb910df28e501e93efbe85e37c..5fe3194e8d9ddc9109147270d0c3a2a3e85b031f 100644 --- a/weboob/frontends/boobank/boobank.py +++ b/weboob/frontends/boobank/boobank.py @@ -39,13 +39,13 @@ def main(self, argv): @ConsoleApplication.command('List every available accounts') def command_list(self): accounts = [] - for name, backend, in self.weboob.iter_backends(): + for backend, in self.weboob.iter_backends(): try: for account in backend.iter_accounts(): accounts.append('%17s %-20s %11.2f %11.2f' % ( account.id, account.label, account.balance, account.coming)) except weboob.tools.browser.BrowserIncorrectPassword: - print >>sys.stderr, 'Error: Incorrect password for backend %s' % name + print >>sys.stderr, 'Error: Incorrect password for backend %s' % backend.name return 1 if len(accounts): print ' ID Account Balance Coming ' @@ -58,7 +58,7 @@ def command_list(self): def command_coming(self, id): operations = [] found = 0 - for name, backend in self.weboob.iter_backends(): + for backend in self.weboob.iter_backends(): try: account = backend.get_account(id) except AccountNotFound: diff --git a/weboob/frontends/dummy/application.py b/weboob/frontends/dummy/application.py index fffa9dbf938840c1245ad1305168c0acb97c3b04..687ece30213f40de0c8c9950173bf22bbc72245b 100644 --- a/weboob/frontends/dummy/application.py +++ b/weboob/frontends/dummy/application.py @@ -31,8 +31,8 @@ class Dummy(BaseApplication): def main(self, argv): self.weboob.load_backends() - for name, backend in self.weboob.iter_backends(): - print 'Backend [%s]' % name + for backend in self.weboob.iter_backends(): + print 'Backend [%s]' % backend.name if backend.has_caps(ICapMessages): print '|- ICapMessages [Print its messages]' for message in backend.iter_messages(): diff --git a/weboob/frontends/havesex/application.py b/weboob/frontends/havesex/application.py index edb98bd94e534a5db788182e2679d419bf87ac08..d5f1d2b920e1f8f595b3eec624b2ffb620bd2979 100644 --- a/weboob/frontends/havesex/application.py +++ b/weboob/frontends/havesex/application.py @@ -59,5 +59,5 @@ def command_profile(self, id): @PromptApplication.command("start profiles walker") def command_walker(self): - for name, backend in self.weboob.iter_backends(): + for backend in self.weboob.iter_backends(): backend.start_profiles_walker() diff --git a/weboob/frontends/travel/application.py b/weboob/frontends/travel/application.py index f28a7f635c26f9d392e3678d981df07a75abe8ac..7226f212fb368ef44f986d7b9d12f291b38632ab 100644 --- a/weboob/frontends/travel/application.py +++ b/weboob/frontends/travel/application.py @@ -35,7 +35,7 @@ def command_stations(self, pattern): print '| ID | Name |' print '+--------------------------------+---------------------------------------------+' count = 0 - for name, backend, in self.weboob.iter_backends(): + for backend, in self.weboob.iter_backends(): for station in backend.iter_station_search(pattern): print '| %-31s| %-44s|' % (station.id, station.name) count += 1 @@ -49,7 +49,7 @@ def command_departures(self, station, arrival=None): print "| ID | Type | Time | Arrival | Late | Info | Plateform |" print "+-----+-----------+-------+-----------------------+-------+--------------------+-----------+" count = 0 - for name, backend, in self.weboob.iter_backends(): + for backend, in self.weboob.iter_backends(): for departure in backend.iter_station_departures(station, arrival): print u"|%4d | %-10s|%6s | %-22s|%6s | %-19s| %-10s|" % (departure.id, departure.type, diff --git a/weboob/frontends/travel_ui/application.py b/weboob/frontends/travel_ui/application.py index 8d03f6242beb26d89eff5b4a8f424aa9824772ab..52b610e76281dae31811beeab54260d3a30b4f0e 100644 --- a/weboob/frontends/travel_ui/application.py +++ b/weboob/frontends/travel_ui/application.py @@ -87,7 +87,7 @@ def __init__(self, weboob): liste = [] #liste = ConfFile('/opt/masstransit/masstransit.cfg').config.items('ListeDesGares') - for name, backend in self.weboob.iter_backends(): + for backend in self.weboob.iter_backends(): for station in backend.iter_station_search(""): liste.append(station) @@ -141,7 +141,7 @@ def on_refresh_button_clicked(self, widget): def refresh(self): "update departures" self.treestore.clear() - for name, backend in self.weboob.iter_backends(): + for backend in self.weboob.iter_backends(): for station in backend.iter_station_search(self.combo_source.get_current_text()): for arrival in backend.iter_station_search(self.combo_dest.get_current_text()): for departure in backend.iter_station_departures(station.id, arrival.id): diff --git a/weboob/frontends/videoob/application.py b/weboob/frontends/videoob/application.py index 838586560684f1dc51ac465339933a63137614c9..90133eb79dbb2310403194b2068dd522ec979f02 100644 --- a/weboob/frontends/videoob/application.py +++ b/weboob/frontends/videoob/application.py @@ -31,7 +31,7 @@ def main(self, argv): @ConsoleApplication.command('Get video file URL from page URL') def command_file_url(self, url): - for name, backend in self.weboob.iter_backends(ICapVideoProvider): + for backend in self.weboob.iter_backends(ICapVideoProvider): video_url = backend.get_video_url(url) if video_url: print video_url @@ -39,7 +39,7 @@ def command_file_url(self, url): @ConsoleApplication.command('Get video title from page URL') def command_title(self, url): - for name, backend in self.weboob.iter_backends(ICapVideoProvider): + for backend in self.weboob.iter_backends(ICapVideoProvider): video_title = backend.get_video_title(url) if video_title: print video_title diff --git a/weboob/frontends/weboobcfg/application.py b/weboob/frontends/weboobcfg/application.py index f9b5cc5ed8dfd36a8dd14ff1dad38980acd30774..a333905d709469f3c333caa04b15f43bfcc5757d 100644 --- a/weboob/frontends/weboobcfg/application.py +++ b/weboob/frontends/weboobcfg/application.py @@ -106,8 +106,8 @@ def command_list(self): @ConsoleApplication.command('Remove a backend') def command_remove(self, name): - if not name in self.weboob.backends_config.iter_backends(): + try: + self.weboob.backends_config.remove_backend(name) + except ConfigParser.NoSectionError: print >>sys.stderr, "Backend '%s' does not exist" % name return 1 - - self.weboob.backends_config.remove_backend(name) diff --git a/weboob/frontends/wetboobs/application.py b/weboob/frontends/wetboobs/application.py index 3a53bbf96e08bde4ef7328a50fc02ff3552041e0..d281f1ff51d5227d90b3ae54a6263a72d0552e4c 100644 --- a/weboob/frontends/wetboobs/application.py +++ b/weboob/frontends/wetboobs/application.py @@ -35,7 +35,7 @@ def command_search(self, pattern): print '| ID | Name |' print '+--------------------------------+---------------------------------------------+' count = 0 - for name, backend, in self.weboob.iter_backends(): + for backend, in self.weboob.iter_backends(): for city in backend.iter_city_search(pattern): print u'| %-31s| %-44s|' % (city.city_id, city.name) count += 1 @@ -49,7 +49,7 @@ def command_current(self, city): print '| Temperature | Text |' print '+-------------+----------------------------------------------------------------+' found = 0 - for name, backend, in self.weboob.iter_backends(): + for backend, in self.weboob.iter_backends(): try: current = backend.get_current(city) print u'| %-12s| %-63s|' % (u'%d °%s' % (current.temp, current.unit), current.text) @@ -67,7 +67,7 @@ def command_forecasts(self, city): print '| Date | Min | Max | Text |' print '+-------------+-------+-------+------------------------------------------------+' found = 0 - for name, backend, in self.weboob.iter_backends(): + for backend, in self.weboob.iter_backends(): try: for f in backend.iter_forecast(city): found = 1 diff --git a/weboob/ouiboube.py b/weboob/ouiboube.py index 434371c42691a5f391adfb2d0b2c389c7cf72dfd..d9e2325e90c9ca603734708dd9fa66a397a899db 100644 --- a/weboob/ouiboube.py +++ b/weboob/ouiboube.py @@ -88,7 +88,7 @@ def load_modules(self, caps=None, names=None, storage=None): def iter_backends(self, caps=None): for name, backend in self.backends.iteritems(): if caps is None or backend.has_caps(caps): - yield (name, backend) + yield backend def schedule(self, interval, function, *args): return self.scheduler.schedule(interval, function, *args)