From c01d2a3c6d08eff01f2e8dd925674706f503b82d Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Sun, 11 Jul 2010 02:20:39 +0200 Subject: [PATCH] s/AdopteUnMec/AuMBrowser/ --- weboob/backends/aum/__init__.py | 2 +- weboob/backends/aum/backend.py | 7 ++----- weboob/backends/aum/browser.py | 4 ++-- weboob/backends/aum/optim/visibility.py | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/weboob/backends/aum/__init__.py b/weboob/backends/aum/__init__.py index 99844335..e4cdb2b8 100644 --- a/weboob/backends/aum/__init__.py +++ b/weboob/backends/aum/__init__.py @@ -16,5 +16,5 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -from .browser import AdopteUnMec +from .browser import AuMBrowser from .backend import AuMBackend diff --git a/weboob/backends/aum/backend.py b/weboob/backends/aum/backend.py index d26e401e..46969015 100644 --- a/weboob/backends/aum/backend.py +++ b/weboob/backends/aum/backend.py @@ -30,7 +30,7 @@ from weboob.capabilities.dating import ICapDating, StatusField from weboob.capabilities.contact import ICapContact, Contact, ProfileNode from weboob.tools.browser import BrowserUnavailable -from .browser import AdopteUnMec +from .browser import AuMBrowser from .exceptions import AdopteWait from .optim.profiles_walker import ProfilesWalker from .optim.visibility import Visibility @@ -53,14 +53,11 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesReply, ICapDating, ICapC STORAGE = {'profiles_walker': {'viewed': []}, 'sluts': {}, } - BROWSER = AdopteUnMec + BROWSER = AuMBrowser def default_browser(self): return self.build_browser(self.config['username'], self.config['password']) - # Private - _profiles_walker = None - def get_status(self): with self.browser: return ( diff --git a/weboob/backends/aum/browser.py b/weboob/backends/aum/browser.py index 7a0e6115..2c450c39 100644 --- a/weboob/backends/aum/browser.py +++ b/weboob/backends/aum/browser.py @@ -41,10 +41,10 @@ from weboob.backends.aum.pages.wait import WaitPage from weboob.capabilities.chat import ChatException, ChatMessage -__all__ = ['AdopteUnMec'] +__all__ = ['AuMBrowser'] -class AdopteUnMec(BaseBrowser): +class AuMBrowser(BaseBrowser): DOMAIN = 'www.adopteunmec.com' PROTOCOL = 'http' ENCODING = 'iso-8859-1' diff --git a/weboob/backends/aum/optim/visibility.py b/weboob/backends/aum/optim/visibility.py index a5110abf..8a9fa28e 100644 --- a/weboob/backends/aum/optim/visibility.py +++ b/weboob/backends/aum/optim/visibility.py @@ -19,7 +19,7 @@ from weboob.tools.browser import BrowserUnavailable from weboob.capabilities.dating import Optimization -from ..browser import AdopteUnMec +from ..browser import AuMBrowser __all__ = ['Visibility'] @@ -40,7 +40,7 @@ class Visibility(Optimization): def reconnect(self): try: - AdopteUnMec(self.browser.username, + AuMBrowser(self.browser.username, self.browser.password, proxy=self.browser.proxy) except BrowserUnavailable, e: