From a09658d6cf4fa3204a351c68280241cae7ae5619 Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Fri, 16 Apr 2010 16:54:26 +0200 Subject: [PATCH] rename Backend to BaseBackend --- weboob/backend.py | 6 +++--- weboob/backends/aum/backend.py | 8 ++++---- weboob/backends/bnporc/backend.py | 8 ++++---- weboob/backends/canaltp/backend.py | 4 ++-- weboob/backends/cragr/backend.py | 10 +++++----- weboob/backends/dlfp/backend.py | 12 ++++++------ weboob/backends/transilien/backend.py | 4 ++-- weboob/backends/youjizz/backend.py | 4 ++-- weboob/backends/youtube/backend.py | 4 ++-- weboob/backends/yweather/backend.py | 8 ++++---- weboob/modules.py | 8 ++++---- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/weboob/backend.py b/weboob/backend.py index 781c44f8..78ed3b30 100644 --- a/weboob/backend.py +++ b/weboob/backend.py @@ -43,7 +43,7 @@ class BackendStorage(object): if self.storage: return self.storage.save(self.name) -class Backend(object): +class BaseBackend(object): # Module name. NAME = None # Name of the maintainer of this module. @@ -79,10 +79,10 @@ class Backend(object): value = config.get(name, field.default) if value is None: - raise Backend.ConfigError('Missing parameter "%s" (%s)' % (name, field.description)) + raise BaseBackend.ConfigError('Missing parameter "%s" (%s)' % (name, field.description)) if field.regexp and re.match(field.regexp, str(value)): - raise Backend.ConfigError('Value of "%s" does not match regexp "%s"' % (name, field.regexp)) + raise BaseBackend.ConfigError('Value of "%s" does not match regexp "%s"' % (name, field.regexp)) if not field.default is None: if isinstance(field.default, bool) and not isinstance(value, bool): diff --git a/weboob/backends/aum/backend.py b/weboob/backends/aum/backend.py index 6b5c7fda..af442719 100644 --- a/weboob/backends/aum/backend.py +++ b/weboob/backends/aum/backend.py @@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ -from weboob.backend import Backend +from weboob.backend import BaseBackend from weboob.capabilities.messages import ICapMessages, ICapMessagesReply from weboob.capabilities.dating import ICapDating from weboob.tools.browser import BrowserUnavailable @@ -26,15 +26,15 @@ from weboob.tools.browser import BrowserUnavailable from .adopte import AdopteUnMec from .optim.profiles_walker import ProfilesWalker -class AuMBackend(Backend, ICapMessages, ICapMessagesReply, ICapDating): +class AuMBackend(BaseBackend, ICapMessages, ICapMessagesReply, ICapDating): NAME = 'aum' MAINTAINER = 'Romain Bignon' EMAIL = 'romain@peerfuse.org' VERSION = '1.0' LICENSE = 'GPLv3' DESCRIPTION = "French dating website" - CONFIG = {'username': Backend.ConfigField(description='Username on website'), - 'password': Backend.ConfigField(description='Password of account', is_masked=True), + CONFIG = {'username': BaseBackend.ConfigField(description='Username on website'), + 'password': BaseBackend.ConfigField(description='Password of account', is_masked=True), } STORAGE = {'profiles_walker': {'viewed': []} } diff --git a/weboob/backends/bnporc/backend.py b/weboob/backends/bnporc/backend.py index d76744ae..83ec8a27 100644 --- a/weboob/backends/bnporc/backend.py +++ b/weboob/backends/bnporc/backend.py @@ -18,12 +18,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ -from weboob.backend import Backend +from weboob.backend import BaseBackend from weboob.capabilities.bank import ICapBank, AccountNotFound from .browser import BNPorc -class BNPorcBackend(Backend, ICapBank): +class BNPorcBackend(BaseBackend, ICapBank): NAME = 'bnporc' MAINTAINER = 'Romain Bignon' EMAIL = 'romain@peerfuse.org' @@ -31,8 +31,8 @@ class BNPorcBackend(Backend, ICapBank): LICENSE = 'GPLv3' DESCRIPTION = 'BNP Paribas french bank\' website' - CONFIG = {'login': Backend.ConfigField(description='Account ID'), - 'password': Backend.ConfigField(description='Password of account', is_masked=True) + CONFIG = {'login': BaseBackend.ConfigField(description='Account ID'), + 'password': BaseBackend.ConfigField(description='Password of account', is_masked=True) } browser = None diff --git a/weboob/backends/canaltp/backend.py b/weboob/backends/canaltp/backend.py index 32b6a528..70d1578d 100644 --- a/weboob/backends/canaltp/backend.py +++ b/weboob/backends/canaltp/backend.py @@ -18,12 +18,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ -from weboob.backend import Backend +from weboob.backend import BaseBackend from weboob.capabilities.travel import ICapTravel, Station, Departure from .browser import CanalTP -class CanalTPBackend(Backend, ICapTravel): +class CanalTPBackend(BaseBackend, ICapTravel): NAME = 'canaltp' MAINTAINER = 'Romain Bignon' EMAIL = 'romain@peerfuse.org' diff --git a/weboob/backends/cragr/backend.py b/weboob/backends/cragr/backend.py index 49ab76ca..c14c1eb5 100644 --- a/weboob/backends/cragr/backend.py +++ b/weboob/backends/cragr/backend.py @@ -18,12 +18,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ -from weboob.backend import Backend +from weboob.backend import BaseBackend from weboob.capabilities.bank import ICapBank, AccountNotFound from .browser import Cragr -class CragrBackend(Backend, ICapBank): +class CragrBackend(BaseBackend, ICapBank): NAME = 'cragr' MAINTAINER = 'Laurent Bachelier' EMAIL = 'laurent@bachelier.name' @@ -31,9 +31,9 @@ class CragrBackend(Backend, ICapBank): DESCRIPTION = 'Credit Agricole french bank\'s website' LICENSE = 'GPLv3' - CONFIG = {'login': Backend.ConfigField(description='Account ID'), - 'password': Backend.ConfigField(description='Password of account', is_masked=True), - 'website': Backend.ConfigField(description='What website to use', default='m.lefil.com'), + CONFIG = {'login': BaseBackend.ConfigField(description='Account ID'), + 'password': BaseBackend.ConfigField(description='Password of account', is_masked=True), + 'website': BaseBackend.ConfigField(description='What website to use', default='m.lefil.com'), } browser = None diff --git a/weboob/backends/dlfp/backend.py b/weboob/backends/dlfp/backend.py index 57ed491d..29524d2d 100644 --- a/weboob/backends/dlfp/backend.py +++ b/weboob/backends/dlfp/backend.py @@ -18,13 +18,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ -from weboob.backend import Backend +from weboob.backend import BaseBackend from weboob.capabilities.messages import ICapMessages, ICapMessagesReply, Message from .feeds import ArticlesList from .browser import DLFP -class DLFPBackend(Backend, ICapMessages, ICapMessagesReply): +class DLFPBackend(BaseBackend, ICapMessages, ICapMessagesReply): NAME = 'dlfp' MAINTAINER = 'Romain Bignon' EMAIL = 'romain@peerfuse.org' @@ -32,10 +32,10 @@ class DLFPBackend(Backend, ICapMessages, ICapMessagesReply): LICENSE = 'GPLv3' DESCRIPTION = "Da Linux French Page" - CONFIG = {'username': Backend.ConfigField(description='Username on website'), - 'password': Backend.ConfigField(description='Password of account', is_masked=True), - 'get_news': Backend.ConfigField(default=True, description='Get newspapers'), - 'get_telegrams': Backend.ConfigField(default=False, description='Get telegrams'), + CONFIG = {'username': BaseBackend.ConfigField(description='Username on website'), + 'password': BaseBackend.ConfigField(description='Password of account', is_masked=True), + 'get_news': BaseBackend.ConfigField(default=True, description='Get newspapers'), + 'get_telegrams': BaseBackend.ConfigField(default=False, description='Get telegrams'), } STORAGE = {'seen': {}} _browser = None diff --git a/weboob/backends/transilien/backend.py b/weboob/backends/transilien/backend.py index 71e8a60c..b8fb7d5c 100644 --- a/weboob/backends/transilien/backend.py +++ b/weboob/backends/transilien/backend.py @@ -18,13 +18,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ -from weboob.backend import Backend +from weboob.backend import BaseBackend from weboob.capabilities.travel import ICapTravel, Station, Departure from .browser import Transilien from .stations import STATIONS -class TransilienBackend(Backend, ICapTravel): +class TransilienBackend(BaseBackend, ICapTravel): NAME = 'transilien' MAINTAINER = u'Julien Hébert' EMAIL = 'juke@free.fr' diff --git a/weboob/backends/youjizz/backend.py b/weboob/backends/youjizz/backend.py index 1bcc632c..f03e1dfc 100644 --- a/weboob/backends/youjizz/backend.py +++ b/weboob/backends/youjizz/backend.py @@ -18,12 +18,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ -from weboob.backend import Backend +from weboob.backend import BaseBackend from weboob.capabilities.video import ICapVideoProvider from .browser import YoujizzBrowser -class YoujizzBackend(Backend, ICapVideoProvider): +class YoujizzBackend(BaseBackend, ICapVideoProvider): NAME = 'youjizz' MAINTAINER = 'Roger Philibert' EMAIL = 'roger.philibert@gmail.com' diff --git a/weboob/backends/youtube/backend.py b/weboob/backends/youtube/backend.py index 1cad4a8e..3156e68e 100644 --- a/weboob/backends/youtube/backend.py +++ b/weboob/backends/youtube/backend.py @@ -18,12 +18,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ -from weboob.backend import Backend +from weboob.backend import BaseBackend from weboob.capabilities.video import ICapVideoProvider from .browser import YoutubeBrowser -class YoutubeBackend(Backend, ICapVideoProvider): +class YoutubeBackend(BaseBackend, ICapVideoProvider): NAME = 'youtube' MAINTAINER = 'Christophe Benz' EMAIL = 'christophe.benz@gmail.com' diff --git a/weboob/backends/yweather/backend.py b/weboob/backends/yweather/backend.py index 2e7d8b35..8cdd5feb 100644 --- a/weboob/backends/yweather/backend.py +++ b/weboob/backends/yweather/backend.py @@ -22,12 +22,12 @@ import urllib2 from xml.dom import minidom # TODO store datetime objects instead of strings -from datetime import datetime +# from datetime import datetime -from weboob.backend import Backend -from weboob.capabilities.weather import ICapWeather, CityNotFound, City, Current, Forecast +from weboob.backend import BaseBackend +from weboob.capabilities.weather import ICapWeather, CityNotFound, Current, Forecast -class YWeatherBackend(Backend, ICapWeather): +class YWeatherBackend(BaseBackend, ICapWeather): NAME = 'yweather' MAINTAINER = 'Romain Bignon' EMAIL = 'romain@peerfuse.org' diff --git a/weboob/modules.py b/weboob/modules.py index 85ee674a..c8539e00 100644 --- a/weboob/modules.py +++ b/weboob/modules.py @@ -26,8 +26,8 @@ import stat from ConfigParser import SafeConfigParser from logging import warning, debug -import weboob.backends as backends -from weboob.backend import Backend +import weboob.backends +from weboob.backend import BaseBackend from weboob.capabilities.cap import ICap class Module: @@ -37,11 +37,11 @@ class Module: self.klass = None for attrname in dir(self.module): attr = getattr(self.module, attrname) - if isinstance(attr, type) and issubclass(attr, Backend) and attr != Backend: + if isinstance(attr, type) and issubclass(attr, BaseBackend) and attr != BaseBackend: self.klass = attr if not self.klass: - raise ImportError("This is not a backend module (no Backend class found)") + raise ImportError("This is not a backend module (no BaseBackend class found)") def get_name(self): return self.klass.NAME