From 404d7290ba82ac2184b18f021a5c948f23713813 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Fri, 13 Aug 2010 22:23:10 +0200 Subject: [PATCH] a lot of pyflakes and pylint fixes --- weboob/applications/boobank/__init__.py | 2 ++ weboob/applications/chatoob/__init__.py | 2 ++ weboob/applications/geolooc/__init__.py | 2 ++ weboob/applications/havesex/__init__.py | 2 ++ weboob/applications/masstransit/__init__.py | 2 ++ weboob/applications/monboob/__init__.py | 2 ++ weboob/applications/qboobmsg/__init__.py | 2 ++ weboob/applications/qhavesex/__init__.py | 2 ++ weboob/applications/qvideoob/__init__.py | 2 ++ weboob/applications/qweboobcfg/__init__.py | 2 ++ weboob/applications/traveloob/__init__.py | 2 ++ weboob/applications/videoob/__init__.py | 2 ++ weboob/applications/videoob_web/__init__.py | 2 ++ weboob/applications/weboobcfg/__init__.py | 2 ++ weboob/applications/weboobcli/__init__.py | 2 ++ weboob/applications/weboobdebug/__init__.py | 2 ++ weboob/applications/weboorrents/__init__.py | 2 ++ weboob/applications/wetboobs/__init__.py | 2 ++ weboob/backends/arte/__init__.py | 2 ++ weboob/backends/aum/__init__.py | 2 ++ weboob/backends/aum/pages/wait.py | 2 +- weboob/backends/bnporc/__init__.py | 2 ++ weboob/backends/bnporc/pages/__init__.py | 3 +++ weboob/backends/canaltp/__init__.py | 2 ++ weboob/backends/cragr/__init__.py | 2 ++ weboob/backends/cragr/pages/__init__.py | 2 ++ weboob/backends/dlfp/pages/news.py | 12 ++++++------ weboob/backends/fourchan/__init__.py | 2 ++ weboob/backends/gazelle/__init__.py | 2 ++ weboob/backends/gazelle/pages/torrents.py | 1 + weboob/backends/geolocip/__init__.py | 2 ++ weboob/backends/ina/__init__.py | 2 ++ weboob/backends/transilien/__init__.py | 2 ++ weboob/backends/yahoo/__init__.py | 2 ++ weboob/backends/yahoo/backend.py | 4 ++-- weboob/backends/youjizz/__init__.py | 2 ++ weboob/backends/youporn/__init__.py | 2 ++ weboob/backends/youtube/__init__.py | 2 ++ weboob/capabilities/messages.py | 2 +- weboob/tools/application/base.py | 4 ++-- .../tools/application/formatters/webkit/__init__.py | 2 ++ weboob/tools/application/qt/__init__.py | 3 +++ weboob/tools/browser/__init__.py | 8 +++++++- 43 files changed, 94 insertions(+), 13 deletions(-) diff --git a/weboob/applications/boobank/__init__.py b/weboob/applications/boobank/__init__.py index b6558548d3..01b506271b 100644 --- a/weboob/applications/boobank/__init__.py +++ b/weboob/applications/boobank/__init__.py @@ -17,3 +17,5 @@ from .boobank import Boobank + +__all__ = ['Boobank'] diff --git a/weboob/applications/chatoob/__init__.py b/weboob/applications/chatoob/__init__.py index e106ea0230..825a26b05d 100644 --- a/weboob/applications/chatoob/__init__.py +++ b/weboob/applications/chatoob/__init__.py @@ -16,3 +16,5 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from .chatoob import Chatoob + +__all__ = ['Chatoob'] diff --git a/weboob/applications/geolooc/__init__.py b/weboob/applications/geolooc/__init__.py index 1cb1c74d4b..fd15b66046 100644 --- a/weboob/applications/geolooc/__init__.py +++ b/weboob/applications/geolooc/__init__.py @@ -18,3 +18,5 @@ from .geolooc import Geolooc + +__all__ = ['Geolooc'] diff --git a/weboob/applications/havesex/__init__.py b/weboob/applications/havesex/__init__.py index 80fb0343e1..8fa22b1547 100644 --- a/weboob/applications/havesex/__init__.py +++ b/weboob/applications/havesex/__init__.py @@ -17,3 +17,5 @@ from .havesex import HaveSex + +__all__ = ['HaveSex'] diff --git a/weboob/applications/masstransit/__init__.py b/weboob/applications/masstransit/__init__.py index 55b190ebbf..b4b2c4550e 100644 --- a/weboob/applications/masstransit/__init__.py +++ b/weboob/applications/masstransit/__init__.py @@ -18,3 +18,5 @@ from .masstransit import Masstransit + +__all__ = ['Masstransit'] diff --git a/weboob/applications/monboob/__init__.py b/weboob/applications/monboob/__init__.py index ee4a0e9786..e89688e4bc 100644 --- a/weboob/applications/monboob/__init__.py +++ b/weboob/applications/monboob/__init__.py @@ -17,3 +17,5 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from .monboob import Monboob + +__all__ = ['Monboob'] diff --git a/weboob/applications/qboobmsg/__init__.py b/weboob/applications/qboobmsg/__init__.py index 3db51dd078..bd1c99ed85 100644 --- a/weboob/applications/qboobmsg/__init__.py +++ b/weboob/applications/qboobmsg/__init__.py @@ -1 +1,3 @@ from .qboobmsg import QBoobMsg + +__all__ = ['QBoobMsg'] diff --git a/weboob/applications/qhavesex/__init__.py b/weboob/applications/qhavesex/__init__.py index e55140d2be..7cbfed211b 100644 --- a/weboob/applications/qhavesex/__init__.py +++ b/weboob/applications/qhavesex/__init__.py @@ -1 +1,3 @@ from .qhavesex import QHaveSex + +__all__ = ['QHaveSex'] diff --git a/weboob/applications/qvideoob/__init__.py b/weboob/applications/qvideoob/__init__.py index 83eea19a9a..1dc7f90f6f 100644 --- a/weboob/applications/qvideoob/__init__.py +++ b/weboob/applications/qvideoob/__init__.py @@ -1 +1,3 @@ from .qvideoob import QVideoob + +__all__ = ['QVideoob'] diff --git a/weboob/applications/qweboobcfg/__init__.py b/weboob/applications/qweboobcfg/__init__.py index 92bef969dc..2c75676a5b 100644 --- a/weboob/applications/qweboobcfg/__init__.py +++ b/weboob/applications/qweboobcfg/__init__.py @@ -17,3 +17,5 @@ from .qweboobcfg import QWeboobCfg + +__all__ = ['QWeboobCfg'] diff --git a/weboob/applications/traveloob/__init__.py b/weboob/applications/traveloob/__init__.py index ace9fa944f..46f8a34285 100644 --- a/weboob/applications/traveloob/__init__.py +++ b/weboob/applications/traveloob/__init__.py @@ -18,3 +18,5 @@ from .traveloob import Traveloob + +__all__ = ['Traveloob'] diff --git a/weboob/applications/videoob/__init__.py b/weboob/applications/videoob/__init__.py index a62cad0937..6bbe3eef0d 100644 --- a/weboob/applications/videoob/__init__.py +++ b/weboob/applications/videoob/__init__.py @@ -17,3 +17,5 @@ from .videoob import Videoob + +__all__ = ['Videoob'] diff --git a/weboob/applications/videoob_web/__init__.py b/weboob/applications/videoob_web/__init__.py index fb8f0ddd46..2c362571d9 100644 --- a/weboob/applications/videoob_web/__init__.py +++ b/weboob/applications/videoob_web/__init__.py @@ -17,3 +17,5 @@ from .videoob_web import VideoobWeb + +__all__ = ['VideoobWeb'] diff --git a/weboob/applications/weboobcfg/__init__.py b/weboob/applications/weboobcfg/__init__.py index 5c1352775f..ef1b321a3b 100644 --- a/weboob/applications/weboobcfg/__init__.py +++ b/weboob/applications/weboobcfg/__init__.py @@ -17,3 +17,5 @@ from .weboobcfg import WeboobCfg + +__all__ = ['WeboobCfg'] diff --git a/weboob/applications/weboobcli/__init__.py b/weboob/applications/weboobcli/__init__.py index fc72e1c035..bd72ec7f0e 100644 --- a/weboob/applications/weboobcli/__init__.py +++ b/weboob/applications/weboobcli/__init__.py @@ -17,3 +17,5 @@ from .weboobcli import WeboobCli + +__all__ = ['WeboobCli'] diff --git a/weboob/applications/weboobdebug/__init__.py b/weboob/applications/weboobdebug/__init__.py index e4655d1943..084a5fc1de 100644 --- a/weboob/applications/weboobdebug/__init__.py +++ b/weboob/applications/weboobdebug/__init__.py @@ -16,3 +16,5 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from .weboobdebug import WeboobDebug + +__all__ = ['WeboobDebug'] diff --git a/weboob/applications/weboorrents/__init__.py b/weboob/applications/weboorrents/__init__.py index 2757e023ad..9e66584429 100644 --- a/weboob/applications/weboorrents/__init__.py +++ b/weboob/applications/weboorrents/__init__.py @@ -17,3 +17,5 @@ from .weboorrents import Weboorrents + +__all__ = ['Weboorrents'] diff --git a/weboob/applications/wetboobs/__init__.py b/weboob/applications/wetboobs/__init__.py index 399170184b..5d1e44076f 100644 --- a/weboob/applications/wetboobs/__init__.py +++ b/weboob/applications/wetboobs/__init__.py @@ -17,3 +17,5 @@ from .wetboobs import WetBoobs + +__all__ = ['WetBoobs'] diff --git a/weboob/backends/arte/__init__.py b/weboob/backends/arte/__init__.py index 854d42985d..bb8b785ab3 100644 --- a/weboob/backends/arte/__init__.py +++ b/weboob/backends/arte/__init__.py @@ -16,3 +16,5 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from .backend import ArteBackend + +__all__ = ['ArteBackend'] diff --git a/weboob/backends/aum/__init__.py b/weboob/backends/aum/__init__.py index e4cdb2b8b4..6f5e12ceb0 100644 --- a/weboob/backends/aum/__init__.py +++ b/weboob/backends/aum/__init__.py @@ -18,3 +18,5 @@ from .browser import AuMBrowser from .backend import AuMBackend + +__all__ = ['AuMBrowser', 'AuMBackend'] diff --git a/weboob/backends/aum/pages/wait.py b/weboob/backends/aum/pages/wait.py index f1d908230c..89fffbfa23 100644 --- a/weboob/backends/aum/pages/wait.py +++ b/weboob/backends/aum/pages/wait.py @@ -30,7 +30,7 @@ def check(self): return result == 'Ok' def process_wait(self): - while not self.check(self): + while not self.check(): sleep(10) self.browser.location('/home.php') diff --git a/weboob/backends/bnporc/__init__.py b/weboob/backends/bnporc/__init__.py index 13d25faed7..f95cca7c8c 100644 --- a/weboob/backends/bnporc/__init__.py +++ b/weboob/backends/bnporc/__init__.py @@ -17,3 +17,5 @@ from .backend import BNPorcBackend + +__all__ = ['BNPorcBackend'] diff --git a/weboob/backends/bnporc/pages/__init__.py b/weboob/backends/bnporc/pages/__init__.py index 1148a9dc94..8567bfa14c 100644 --- a/weboob/backends/bnporc/pages/__init__.py +++ b/weboob/backends/bnporc/pages/__init__.py @@ -22,3 +22,6 @@ from .login import LoginPage, ConfirmPage class AccountPrelevement(AccountsList): pass + +__all__ = ['AccountsList', 'AccountComing', 'AccountHistory', 'LoginPage', + 'ConfirmPage', 'AccountPrelevement'] diff --git a/weboob/backends/canaltp/__init__.py b/weboob/backends/canaltp/__init__.py index 5b612e900e..417767dae4 100644 --- a/weboob/backends/canaltp/__init__.py +++ b/weboob/backends/canaltp/__init__.py @@ -17,3 +17,5 @@ from .backend import CanalTPBackend + +__all__ = ['CanalTPBackend'] diff --git a/weboob/backends/cragr/__init__.py b/weboob/backends/cragr/__init__.py index 3b640ff144..e5c024e7f7 100644 --- a/weboob/backends/cragr/__init__.py +++ b/weboob/backends/cragr/__init__.py @@ -17,3 +17,5 @@ from .backend import CragrBackend + +__all__ = ['CragrBackend'] diff --git a/weboob/backends/cragr/pages/__init__.py b/weboob/backends/cragr/pages/__init__.py index b2f77ab440..4f034f6fb1 100644 --- a/weboob/backends/cragr/pages/__init__.py +++ b/weboob/backends/cragr/pages/__init__.py @@ -18,3 +18,5 @@ from .accounts_list import AccountsList from .login import LoginPage + +__all__ = ['AccountsList', 'LoginPage'] diff --git a/weboob/backends/dlfp/pages/news.py b/weboob/backends/dlfp/pages/news.py index e0a0357459..5716155496 100644 --- a/weboob/backends/dlfp/pages/news.py +++ b/weboob/backends/dlfp/pages/news.py @@ -83,12 +83,12 @@ def __init__(self, browser, _id, tree): if a.text: self.title += a.text if a.tail: self.title += a.tail self.title = self.title.strip() - subdivs = div.findall('a') - if len(subdivs) > 1: - date_s = unicode(subdivs[1].text) - else: - date_s = unicode(div.find('i').tail) - #print date_s + # TODO use the date_s + #subdivs = div.findall('a') + #if len(subdivs) > 1: + # date_s = unicode(subdivs[1].text) + #else: + # date_s = unicode(div.find('i').tail) if div.attrib.get('class', '').startswith('bodydiv '): self.body = self.browser.parser.tostring(div) diff --git a/weboob/backends/fourchan/__init__.py b/weboob/backends/fourchan/__init__.py index 5abbf6a56b..29b470fccb 100644 --- a/weboob/backends/fourchan/__init__.py +++ b/weboob/backends/fourchan/__init__.py @@ -1,2 +1,4 @@ from .backend import FourChanBackend from .browser import FourChan + +__all__ = ['FourChanBackend', 'FourChan'] diff --git a/weboob/backends/gazelle/__init__.py b/weboob/backends/gazelle/__init__.py index 4bb00a62c7..b3f0c068b4 100644 --- a/weboob/backends/gazelle/__init__.py +++ b/weboob/backends/gazelle/__init__.py @@ -1 +1,3 @@ from .backend import GazelleBackend + +__all__ = ['GazelleBackend'] diff --git a/weboob/backends/gazelle/pages/torrents.py b/weboob/backends/gazelle/pages/torrents.py index 62fd57372d..1cffad6ef7 100644 --- a/weboob/backends/gazelle/pages/torrents.py +++ b/weboob/backends/gazelle/pages/torrents.py @@ -167,6 +167,7 @@ def get_torrent(self, id): div = self.document.getroot().cssselect('div#files_%s' % torrent.id) if div: + torrent.files = [] for tr in div[0].find('table'): if tr.attrib.get('class', None) != 'colhead_dark': torrent.files.append(tr.find('td').text) diff --git a/weboob/backends/geolocip/__init__.py b/weboob/backends/geolocip/__init__.py index a9570dfb4a..c3fd9e200d 100644 --- a/weboob/backends/geolocip/__init__.py +++ b/weboob/backends/geolocip/__init__.py @@ -1 +1,3 @@ from .backend import GeolocIpBackend + +__all__ = ['GeolocIpBackend'] diff --git a/weboob/backends/ina/__init__.py b/weboob/backends/ina/__init__.py index 893910a0a9..f562b493b9 100644 --- a/weboob/backends/ina/__init__.py +++ b/weboob/backends/ina/__init__.py @@ -1 +1,3 @@ from .backend import InaBackend + +__all__ = ['InaBackend'] diff --git a/weboob/backends/transilien/__init__.py b/weboob/backends/transilien/__init__.py index a599598bbe..db9d49a2e3 100644 --- a/weboob/backends/transilien/__init__.py +++ b/weboob/backends/transilien/__init__.py @@ -17,3 +17,5 @@ from .backend import TransilienBackend + +__all__ = ['TransilienBackend'] diff --git a/weboob/backends/yahoo/__init__.py b/weboob/backends/yahoo/__init__.py index 9fb373f27e..5f1697ec09 100644 --- a/weboob/backends/yahoo/__init__.py +++ b/weboob/backends/yahoo/__init__.py @@ -17,3 +17,5 @@ from .backend import YahooBackend + +__all__ = ['YahooBackend'] diff --git a/weboob/backends/yahoo/backend.py b/weboob/backends/yahoo/backend.py index 387f67a608..9e0810a5cd 100644 --- a/weboob/backends/yahoo/backend.py +++ b/weboob/backends/yahoo/backend.py @@ -51,12 +51,12 @@ def _get_weather_dom(self, city_id): return dom def get_current(self, city_id): - dom = self._get_dom(city_id) + dom = self._get_weather_dom(city_id) current = dom.getElementsByTagName('yweather:condition')[0] return Current(current.getAttribute('date'), int(current.getAttribute('temp')), current.getAttribute('text'), 'C') def iter_forecast(self, city_id): - dom = self._get_dom(city_id) + dom = self._get_weather_dom(city_id) for forecast in dom.getElementsByTagName('yweather:forecast'): yield Forecast(forecast.getAttribute('date'), int(forecast.getAttribute('low')), diff --git a/weboob/backends/youjizz/__init__.py b/weboob/backends/youjizz/__init__.py index 93a8e1178a..1c279e3b42 100644 --- a/weboob/backends/youjizz/__init__.py +++ b/weboob/backends/youjizz/__init__.py @@ -16,3 +16,5 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from .backend import YoujizzBackend + +__all__ = ['YoujizzBackend'] diff --git a/weboob/backends/youporn/__init__.py b/weboob/backends/youporn/__init__.py index 9ffb6a5e72..0546c5aa90 100644 --- a/weboob/backends/youporn/__init__.py +++ b/weboob/backends/youporn/__init__.py @@ -1 +1,3 @@ from .backend import YoupornBackend + +__all__ = ['YoupornBackend'] diff --git a/weboob/backends/youtube/__init__.py b/weboob/backends/youtube/__init__.py index 0a03a22d00..debdc0a870 100644 --- a/weboob/backends/youtube/__init__.py +++ b/weboob/backends/youtube/__init__.py @@ -16,3 +16,5 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from .backend import YoutubeBackend + +__all__ = ['YoutubeBackend'] diff --git a/weboob/capabilities/messages.py b/weboob/capabilities/messages.py index 2dd5def6f1..0c326dfdf5 100644 --- a/weboob/capabilities/messages.py +++ b/weboob/capabilities/messages.py @@ -19,7 +19,7 @@ import datetime import time -from .base import IBaseCap, CapBaseObject, NotLoaded +from .base import IBaseCap, CapBaseObject __all__ = ['ICapMessages', 'ICapMessagesReply', 'Message'] diff --git a/weboob/tools/application/base.py b/weboob/tools/application/base.py index ffe0e45356..775a28535a 100644 --- a/weboob/tools/application/base.py +++ b/weboob/tools/application/base.py @@ -223,8 +223,8 @@ def complete(self, backend, count, selected_fields, function, *args, **kwargs): else: res = getattr(backend, function)(*args, **kwargs) - if self.selected_fields: - fields = self.selected_fields + if selected_fields: + fields = selected_fields else: fields = None diff --git a/weboob/tools/application/formatters/webkit/__init__.py b/weboob/tools/application/formatters/webkit/__init__.py index c4813c563e..1207a2f940 100644 --- a/weboob/tools/application/formatters/webkit/__init__.py +++ b/weboob/tools/application/formatters/webkit/__init__.py @@ -17,3 +17,5 @@ from .webkitgtk import WebkitGtkFormatter + +__all__ = ['WebkitGtkFormatter'] diff --git a/weboob/tools/application/qt/__init__.py b/weboob/tools/application/qt/__init__.py index 210f8cf433..af213a8c2f 100644 --- a/weboob/tools/application/qt/__init__.py +++ b/weboob/tools/application/qt/__init__.py @@ -1,2 +1,5 @@ from .qt import QtApplication, QtMainWindow, QtDo, HTMLDelegate from .backendcfg import BackendCfg + +__all__ = ['QtApplication', 'QtMainWindow', 'QtDo', 'HTMLDelegate', + 'BackendCfg'] diff --git a/weboob/tools/browser/__init__.py b/weboob/tools/browser/__init__.py index 515687bc12..a65d9c84ff 100644 --- a/weboob/tools/browser/__init__.py +++ b/weboob/tools/browser/__init__.py @@ -16,4 +16,10 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -from weboob.tools.browser.browser import * +from weboob.tools.browser.browser import BrowserIncorrectPassword, BrowserBanned, \ + BrowserUnavailable, BrowserRetry, \ + BrowserHTTPError, BasePage, BaseBrowser + + +__all__ = ['BrowserIncorrectPassword', 'BrowserBanned', 'BrowserUnavailable', 'BrowserRetry', + 'BrowserHTTPError', 'BasePage', 'BaseBrowser'] -- GitLab