nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename Browser to BaseBrowser

Browse source
This commit is contained in:
Christophe Benz 2010-04-16 17:27:09 +02:00
commit 2ca57c15a8
9 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
weboob/backends/aum/adopte.py
View file

@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import time
from logging import warning
from weboob.tools.browser import Browser
from weboob.tools.browser import BaseBrowser
from weboob.tools.parser import Html5libParser
from weboob.backends.aum.exceptions import AdopteWait
@ -36,7 +36,7 @@ from weboob.backends.aum.pages.login import LoginPage, RedirectPage, BanPage, Er
from weboob.backends.aum.pages.edit import EditPhotoPage, EditPhotoCbPage, EditAnnouncePage, EditDescriptionPage, EditSexPage, EditPersonalityPage
from weboob.backends.aum.pages.wait import WaitPage
class AdopteUnMec(Browser):
class AdopteUnMec(BaseBrowser):
DOMAIN = 'www.adopteunmec.com'
PROTOCOL = 'http'
ENCODING = 'iso-8859-1'
@ -71,7 +71,7 @@ class AdopteUnMec(Browser):
def __init__(self, *args, **kwargs):
kwargs['parser'] = Html5libParser(api='dom')
Browser.__init__(self, *args, **kwargs)
BaseBrowser.__init__(self, *args, **kwargs)
self.my_id = 0
def login(self):

6
weboob/backends/bnporc/browser.py
View file

@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
from cStringIO import StringIO
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword
from weboob.tools.parser import ElementTidyParser
from weboob.backends.bnporc import pages
@ -33,7 +33,7 @@ class BNParser(ElementTidyParser):
return ElementTidyParser.parse(self, data, encoding)
# Browser
class BNPorc(Browser):
class BNPorc(BaseBrowser):
DOMAIN = 'www.secure.bnpparibas.net'
PROTOCOL = 'https'
ENCODING = None # refer to the HTML encoding
@ -51,7 +51,7 @@ class BNPorc(Browser):
def __init__(self, *args, **kwargs):
kwargs['parser'] = BNParser()
kwargs['history'] = None # need history
Browser.__init__(self, *args, **kwargs)
BaseBrowser.__init__(self, *args, **kwargs)
def home(self):
self.location('https://www.secure.bnpparibas.net/banque/portail/particulier/HomeConnexion?type=homeconnex')

6
weboob/backends/canaltp/browser.py
View file

@ -19,16 +19,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
"""
from datetime import datetime, date, time
from weboob.tools.browser import Browser
from weboob.tools.browser import BaseBrowser
from weboob.tools.misc import toUnicode
class CanalTP(Browser):
class CanalTP(BaseBrowser):
DOMAIN = 'widget.canaltp.fr'
PROTOCOL = 'http'
PAGES = {}
def __init__(self):
Browser.__init__(self, '')
BaseBrowser.__init__(self, '')
def iter_station_search(self, pattern):
result = self.openurl(u"http://widget.canaltp.fr/Prochains_departs_15122009/dev/gare.php?txtrech=%s" % unicode(pattern)).read()

6
weboob/backends/cragr/browser.py
View file

@ -18,11 +18,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
"""
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword
from weboob.backends.cragr import pages
# Browser
class Cragr(Browser):
class Cragr(BaseBrowser):
PROTOCOL = 'https'
ENCODING = 'utf-8'
USER_AGENT = 'Wget/1.11.4'
@ -35,7 +35,7 @@ class Cragr(Browser):
'https://%s/.*\.c.*' % website: pages.AccountsList,
'https://%s/login/process' % website: pages.AccountsList,
}
Browser.__init__(self, *args, **kwargs)
BaseBrowser.__init__(self, *args, **kwargs)
def viewing_html(self):
"""

6
weboob/backends/dlfp/browser.py
View file

@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import urllib
from cStringIO import StringIO
from weboob.tools.browser import Browser
from weboob.tools.browser import BaseBrowser
from .pages.index import IndexPage, LoginPage
from .pages.news import ContentPage
from .tools import id2url, id2threadid, id2contenttype
@ -37,7 +37,7 @@ class DLFParser(StandardParser):
return StandardParser.parse(self, data, encoding)
# Browser
class DLFP(Browser):
class DLFP(BaseBrowser):
DOMAIN = 'linuxfr.org'
PROTOCOL = 'https'
PAGES = {'https://linuxfr.org/': IndexPage,
@ -49,7 +49,7 @@ class DLFP(Browser):
def __init__(self, *args, **kwargs):
kwargs['parser'] = DLFParser()
Browser.__init__(self, *args, **kwargs)
BaseBrowser.__init__(self, *args, **kwargs)
def home(self):
return self.location('https://linuxfr.org')

6
weboob/backends/transilien/browser.py
View file

@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
from datetime import datetime, date, time
import HTMLParser
from weboob.tools.browser import Browser
from weboob.tools.browser import BaseBrowser
from weboob.tools.misc import toUnicode
from .pages.route import RoutePage
@ -114,7 +114,7 @@ class Parser(HTMLParser.HTMLParser):
__curseur_horaire += 1
return __list_route
class Transilien(Browser):
class Transilien(BaseBrowser):
DOMAIN = 'www.transilien.com'
PROTOCOL = 'http'
PAGES = {'http://www\.transilien\.com/web/ITProchainsTrainsAvecDest\.do\?.*': RoutePage,
@ -122,7 +122,7 @@ class Transilien(Browser):
}
def __init__(self):
Browser.__init__(self, '', parser=Parser())
BaseBrowser.__init__(self, '', parser=Parser())
def iter_station_search(self, pattern):
pass

4
weboob/backends/youjizz/browser.py
View file

@ -21,10 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
from logging import error
import re
from weboob.tools.browser import Browser
from weboob.tools.browser import BaseBrowser
from weboob.tools.parser import LxmlHtmlParser
class YoujizzBrowser(Browser):
class YoujizzBrowser(BaseBrowser):
video_file_regex = re.compile(r'"(http://media[^ ,]+\.flv)"')
def __init__(self, *args, **kwargs):

10
weboob/backends/youtube/browser.py
View file

@ -20,18 +20,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import re
from weboob.tools.browser import Browser
from weboob.tools.browser import BaseBrowser
from weboob.tools.parser import LxmlHtmlParser
from .pages import VideoPage
class YoutubeBrowser(Browser):
video_signature_regex = re.compile(r'&t=([^ ,&]*)')
class YoutubeBrowser(BaseBrowser):
video_signature_regex = re.compile(r'&t=([^ ,&]*)')
def __init__(self, *args, **kwargs):
kwargs['parser'] = LxmlHtmlParser()
self.PAGES = {r'http://.*\.youtube\.com/watch\?v=(.+)': VideoPage}
Browser.__init__(self, *args, **kwargs)
self.PAGES = {r'.*youtube\.com/watch\?v=(.+)': VideoPage}
BaseBrowser.__init__(self, *args, **kwargs)
def get_video_title(self, page_url):
self.location(page_url)

2
weboob/tools/browser.py
View file

@ -75,7 +75,7 @@ class BasePage(object):
"""
pass
class Browser(mechanize.Browser):
class BaseBrowser(mechanize.Browser):
"""
Base browser class to navigate on a website.
"""