Weboob class

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()
+

weboob/tools/browser.py

@@ -18,8 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 """
 
-import mechanize.Browser
+import mechanize
-from mechanize import response_seek_wrapper, BrowserStateError
 import urllib2
 import html5lib
 from html5lib import treebuilders
@@ -130,21 +129,21 @@ class Browser(mechanize.Browser):
     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 @@ class Browser(mechanize.Browser):
     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 @@ class Browser(mechanize.Browser):
         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)
 

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