From 1847ea5f341b6eee108fd11684a13f0a93bc87ee Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Mon, 12 Jul 2010 03:09:24 +0200 Subject: [PATCH] code clean code clean --- .../applications/weboorrents/weboorrents.py | 1 - weboob/backends/canaltp/backend.py | 4 +++ weboob/backends/dlfp/backend.py | 6 ++++- weboob/backends/fourchan/backend.py | 9 +++++-- weboob/backends/gazelle/backend.py | 8 +++--- weboob/backends/ina/backend.py | 1 - weboob/backends/ina/pages/video.py | 2 +- weboob/backends/youjizz/backend.py | 1 - weboob/backends/youporn/backend.py | 1 - weboob/backends/youporn/pages/base.py | 2 +- weboob/backends/yweather/backend.py | 7 +++++- weboob/capabilities/dating.py | 8 ++++-- weboob/tools/browser/browser.py | 25 +++++++++++++++---- weboob/tools/storage.py | 1 - 14 files changed, 54 insertions(+), 22 deletions(-) diff --git a/weboob/applications/weboorrents/weboorrents.py b/weboob/applications/weboorrents/weboorrents.py index f3c70e38..abbc6980 100644 --- a/weboob/applications/weboorrents/weboorrents.py +++ b/weboob/applications/weboorrents/weboorrents.py @@ -30,7 +30,6 @@ class Weboorrents(ConsoleApplication): APPNAME = 'weboorrents' VERSION = '0.1' COPYRIGHT = 'Copyright(C) 2010 Romain Bignon' - CONFIG = {} def main(self, argv): self.load_configured_backends(ICapTorrent) diff --git a/weboob/backends/canaltp/backend.py b/weboob/backends/canaltp/backend.py index 7d34cca8..564a1136 100644 --- a/weboob/backends/canaltp/backend.py +++ b/weboob/backends/canaltp/backend.py @@ -21,6 +21,10 @@ from weboob.capabilities.travel import ICapTravel, Station, Departure from .browser import CanalTP + +__all__ = ['CanalTPBackend'] + + class CanalTPBackend(BaseBackend, ICapTravel): NAME = 'canaltp' MAINTAINER = 'Romain Bignon' diff --git a/weboob/backends/dlfp/backend.py b/weboob/backends/dlfp/backend.py index c949184d..21fcf2c1 100644 --- a/weboob/backends/dlfp/backend.py +++ b/weboob/backends/dlfp/backend.py @@ -17,13 +17,17 @@ from __future__ import with_statement -from weboob.core.backend import BaseBackend +from weboob.tools.backend import BaseBackend from weboob.tools.browser import BrowserUnavailable from weboob.capabilities.messages import ICapMessages, ICapMessagesReply, Message from .feeds import ArticlesList from .browser import DLFP + +__all__ = ['DLFPBackend'] + + class DLFPBackend(BaseBackend, ICapMessages, ICapMessagesReply): NAME = 'dlfp' MAINTAINER = 'Romain Bignon' diff --git a/weboob/backends/fourchan/backend.py b/weboob/backends/fourchan/backend.py index 7070f6f8..e4973ff4 100644 --- a/weboob/backends/fourchan/backend.py +++ b/weboob/backends/fourchan/backend.py @@ -15,15 +15,20 @@ # 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 from logging import warning -from weboob.core.backend import BaseBackend from weboob.capabilities.messages import ICapMessages, Message +from weboob.tools.backend import BaseBackend from .browser import FourChan + +__all__ = ['FourChanBackend'] + + class FourChanBackend(BaseBackend, ICapMessages): NAME = 'fourchan' MAINTAINER = 'Romain Bignon' @@ -32,7 +37,7 @@ class FourChanBackend(BaseBackend, ICapMessages): LICENSE = 'GPLv3' DESCRIPTION = "4chan website" - CONFIG = {'boards': BaseBackend.ConfigField(description='Boards'), + CONFIG = {'boards': BaseBackend.ConfigField(description='Boards'), } STORAGE = {'boards': {}} BROWSER = FourChan diff --git a/weboob/backends/gazelle/backend.py b/weboob/backends/gazelle/backend.py index dd460229..e11b3036 100644 --- a/weboob/backends/gazelle/backend.py +++ b/weboob/backends/gazelle/backend.py @@ -33,10 +33,10 @@ class GazelleBackend(BaseBackend, ICapTorrent): DESCRIPTION = 'gazelle bittorrent tracker' LICENSE = 'GPLv3' - CONFIG = {'username': BaseBackend.ConfigField(description='Username on website'), - 'password': BaseBackend.ConfigField(description='Password of account', is_masked=True), - 'protocol': BaseBackend.ConfigField(description='Protocol to use ("http" or "https")', regexp='^(http|https)$'), - 'domain': BaseBackend.ConfigField(description='Domain (example "ssl.what.cd")'), + CONFIG = {'username': BaseBackend.ConfigField(description='Username on website'), + 'password': BaseBackend.ConfigField(description='Password of account', is_masked=True), + 'protocol': BaseBackend.ConfigField(description='Protocol to use ("http" or "https")', regexp='^(http|https)$'), + 'domain': BaseBackend.ConfigField(description='Domain (example "ssl.what.cd")'), } BROWSER = GazelleBrowser diff --git a/weboob/backends/ina/backend.py b/weboob/backends/ina/backend.py index e058a001..884e27fa 100644 --- a/weboob/backends/ina/backend.py +++ b/weboob/backends/ina/backend.py @@ -35,7 +35,6 @@ class InaBackend(BaseBackend, ICapVideo): DESCRIPTION = 'INA french video archives' LICENSE = 'GPLv3' - CONFIG = {} BROWSER = InaBrowser def get_video(self, _id): diff --git a/weboob/backends/ina/pages/video.py b/weboob/backends/ina/pages/video.py index 7552e80c..c357b659 100644 --- a/weboob/backends/ina/pages/video.py +++ b/weboob/backends/ina/pages/video.py @@ -29,7 +29,7 @@ from weboob.tools.browser import BasePage from ..video import InaVideo -__ALL__ = ['VideoPage'] +__all__ = ['VideoPage'] class VideoPage(BasePage): diff --git a/weboob/backends/youjizz/backend.py b/weboob/backends/youjizz/backend.py index 965d682e..82236c71 100644 --- a/weboob/backends/youjizz/backend.py +++ b/weboob/backends/youjizz/backend.py @@ -33,7 +33,6 @@ class YoujizzBackend(BaseBackend, ICapVideo): DESCRIPTION = 'Youjizz videos website' LICENSE = 'GPLv3' - CONFIG = {} BROWSER = YoujizzBrowser def get_video(self, _id): diff --git a/weboob/backends/youporn/backend.py b/weboob/backends/youporn/backend.py index ed85f913..61a055ac 100644 --- a/weboob/backends/youporn/backend.py +++ b/weboob/backends/youporn/backend.py @@ -33,7 +33,6 @@ class YoupornBackend(BaseBackend, ICapVideo): DESCRIPTION = 'Youporn videos website' LICENSE = 'GPLv3' - CONFIG = {} BROWSER = YoupornBrowser def get_video(self, _id): diff --git a/weboob/backends/youporn/pages/base.py b/weboob/backends/youporn/pages/base.py index 5a4b4a86..382f4998 100644 --- a/weboob/backends/youporn/pages/base.py +++ b/weboob/backends/youporn/pages/base.py @@ -33,5 +33,5 @@ class PornPage(BasePage): self.browser.select_form(nr=0) self.browser.submit(name='user_choice') return False - except (ControlNotFoundError,FormNotFoundError): + except (ControlNotFoundError, FormNotFoundError): return True diff --git a/weboob/backends/yweather/backend.py b/weboob/backends/yweather/backend.py index 22ff2423..5fd8ec89 100644 --- a/weboob/backends/yweather/backend.py +++ b/weboob/backends/yweather/backend.py @@ -25,6 +25,10 @@ from xml.dom import minidom from weboob.core.backend import BaseBackend from weboob.capabilities.weather import ICapWeather, CityNotFound, Current, Forecast + +__all__ = ['YWeatherBackend'] + + class YWeatherBackend(BaseBackend, ICapWeather): NAME = 'yweather' MAINTAINER = 'Romain Bignon' @@ -59,4 +63,5 @@ class YWeatherBackend(BaseBackend, ICapWeather): int(forecast.getAttribute('low')), int(forecast.getAttribute('high')), forecast.getAttribute('text'), - 'C') + 'C', + ) diff --git a/weboob/capabilities/dating.py b/weboob/capabilities/dating.py index 256963cf..155e12f1 100644 --- a/weboob/capabilities/dating.py +++ b/weboob/capabilities/dating.py @@ -19,10 +19,12 @@ from .cap import ICap -__all__ = ['ICapDating', 'Profile'] +__all__ = ['ICapDating'] -class OptimizationNotFound(Exception): pass +class OptimizationNotFound(Exception): + pass + class Optimization(object): def start(self): @@ -31,6 +33,7 @@ class Optimization(object): def stop(self): raise NotImplementedError() + class StatusField(object): FIELD_TEXT = 0x001 # the value is a long text FIELD_HTML = 0x002 # the value is HTML formated @@ -41,6 +44,7 @@ class StatusField(object): self.value = value self.flags = flags + class ICapDating(ICap): def get_status(self): """ diff --git a/weboob/tools/browser/browser.py b/weboob/tools/browser/browser.py index 9ad5537f..d52edd52 100644 --- a/weboob/tools/browser/browser.py +++ b/weboob/tools/browser/browser.py @@ -50,27 +50,42 @@ __all__ = ['BrowserIncorrectPassword', 'BrowserBanned', 'BrowserUnavailable', 'B class BrowserIncorrectPassword(Exception): pass + class BrowserBanned(BrowserIncorrectPassword): pass + class BrowserUnavailable(Exception): pass + class BrowserRetry(Exception): pass + class ExpectedElementNotFound(Exception): pass + class NoHistory(object): """ We don't want to fill memory with history """ - def __init__(self): pass - def add(self, request, response): pass - def back(self, n, _response): pass - def clear(self): pass - def close(self): pass + def __init__(self): + pass + + def add(self, request, response): + pass + + def back(self, n, _response): + pass + + def clear(self): + pass + + def close(self): + pass + class BasePage(object): """ diff --git a/weboob/tools/storage.py b/weboob/tools/storage.py index 8969f361..55147d15 100644 --- a/weboob/tools/storage.py +++ b/weboob/tools/storage.py @@ -17,7 +17,6 @@ from copy import deepcopy -from logging import error from .config.yamlconfig import YamlConfig