diff --git a/weboob/__init__.py b/weboob/__init__.py index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..82a89af32db3fc66d517dfc794b9988f4e1147c2 100644 --- a/weboob/__init__.py +++ b/weboob/__init__.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- + +""" +Copyright(C) 2010 Romain Bignon + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, version 3 of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +""" + +import os + +from weboob.modules import ModulesLoader +from weboob.config import Config + +class Weboob: + CONFIG_FILE = '%s/.weboobrc' % os.path.expanduser("~") + + def __init__(self, app_name, config_file=CONFIG_FILE): + self.app_name = app_name + self.backends = {} + self.config = Config(self.CONFIG_FILE) + self.config.load() + self.modules_loader = ModulesLoader() + self.modules_loader.load() + diff --git a/weboob/tools/browser.py b/weboob/tools/browser.py index 8cef4e7799f5c7242bc526da399b1f42c6d110d7..60603f10bb8376111628f7c2233ec6582e24688d 100644 --- a/weboob/tools/browser.py +++ b/weboob/tools/browser.py @@ -18,8 +18,7 @@ """ -import mechanize.Browser -from mechanize import response_seek_wrapper, BrowserStateError +import mechanize import urllib2 import html5lib from html5lib import treebuilders @@ -130,21 +129,21 @@ def inner(self, *args, **kwargs): def openurl(self, *args, **kwargs): try: return mechanize.Browser.open(self, *args, **kwargs) - except (response_seek_wrapper, urllib2.HTTPError, urllib2.URLError), e: + except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError), e: error(e) raise BrowserUnavailable() - except BrowserStateError: + except mechanize.BrowserStateError: self.home() return mechanize.Browser.open(self, *args, **kwargs) def submit(self, *args, **kwargs): try: self.__changeLocation(mechanize.Browser.submit(self, *args, **kwargs)) - except (response_seek_wrapper, urllib2.HTTPError, urllib2.URLError), e: + except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError), e: error(e) self.page = None raise BrowserUnavailable() - except (BrowserStateError,BrowserRetry): + except (mechanize.BrowserStateError,BrowserRetry): self.home() raise BrowserUnavailable() @@ -154,11 +153,11 @@ def isOnPage(self, pageCls): def follow_link(self, *args, **kwargs): try: self.__changeLocation(mechanize.Browser.follow_link(self, *args, **kwargs)) - except (response_seek_wrapper, urllib2.HTTPError, urllib2.URLError), e: + except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError), e: error(e) self.page = None raise BrowserUnavailable() - except (BrowserStateError,BrowserRetry): + except (mechanize.BrowserStateError,BrowserRetry): self.home() raise BrowserUnavailable() @@ -172,11 +171,11 @@ def location(self, *args, **kwargs): except BrowserRetry: if not self.page or not args or self.page.url != args[0]: self.location(keep_args, keep_kwargs) - except (response_seek_wrapper, urllib2.HTTPError, urllib2.URLError), e: + except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError), e: error(e) self.page = None raise BrowserUnavailable() - except BrowserStateError: + except mechanize.BrowserStateError: self.home() self.location(*keep_args, **keep_kwargs) diff --git a/weboob2mail b/weboob2mail index abb8a7c4a67763af2ccf5183c726660b90c49b95..37141bf4f89ec29b0af2ecbf98a59cfd4307bd1b 100755 --- a/weboob2mail +++ b/weboob2mail @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ import sys -from dlfp import DLFP +from weboob import Weboob class User: def __init__(self, username, password, email): @@ -30,8 +30,10 @@ class User: self.email = email class Application: + APPNAME = 'weboob2mail' + def __init__(self): - pass + self.weboob = Weboob(self.APPNAME) def main(self, argv): pass