rename things related to browsers
weboob.tools.browser -> weboob.deprecated.browser weboob.tools.parsers -> weboob.deprecated.browser.parsers weboob.tools.mech -> weboob.deprecated.mech weboob.browser2 -> weboob.browser weboob.core.exceptions -> weboob.exceptions Also, the new tree for browser2 is: weboob.browser: import weboob.browser.browsers.* and weboob.browser.url.* weboob.browser.browsers: all browsers (including PagesBrowser and LoginBrowser) weboob.browser.url: the URL class weboob.browser.profiles: all Profile classes weboob.browser.sessions: WeboobSession and FuturesSession weboob.browser.cookies: that's a cookies thing weboob.browser.pages: all Page and derivated classes, and Form class weboob.browser.exceptions: specific browser exceptions weboob.browser.elements: AbstractElement classes, and 'method' decorator weboob.browser.filters.*: all filters
This commit is contained in:
parent
1f95e7631f
commit
d61e15cf84
396 changed files with 1442 additions and 1382 deletions
|
|
@ -1,72 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Copyright(C) 2010-2011 Christophe Benz, Laurent Bachelier
|
||||
#
|
||||
# This file is part of weboob.
|
||||
#
|
||||
# weboob is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# weboob 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 Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
__all__ = ['check_url', 'id2url']
|
||||
|
||||
from urlparse import urlsplit
|
||||
import re
|
||||
|
||||
|
||||
class check_url(object):
|
||||
"""
|
||||
Checks if the first argument matches the given regular expression (given as str,
|
||||
without the ^$ delimiters which are automatically added).
|
||||
If not, this decorator will return None instead of calling the function.
|
||||
"""
|
||||
|
||||
def __init__(self, regexp):
|
||||
self.regexp = re.compile('^%s$' % regexp)
|
||||
|
||||
def __call__(self, func):
|
||||
def wrapper(funcself, *args, **kwargs):
|
||||
if self.regexp.match(args[0]):
|
||||
return func(funcself, *args, **kwargs)
|
||||
return None
|
||||
return wrapper
|
||||
|
||||
|
||||
def id2url(id2url):
|
||||
"""
|
||||
If the first argument is not an URL, this decorator will try to
|
||||
convert it to one, by calling the id2url function.
|
||||
If id2url returns None (because the id is invalid), the decorated
|
||||
function will not be called and None will be returned.
|
||||
If the DOMAIN attribute of the method's class is not empty, it will
|
||||
also check it. If it does not match, the decorated function will not
|
||||
be called and None will be returned.
|
||||
"""
|
||||
def wrapper(func):
|
||||
def inner(self, *args, **kwargs):
|
||||
arg = unicode(args[0])
|
||||
if arg.startswith('http://') or arg.startswith('https://'):
|
||||
domain = urlsplit(arg).netloc
|
||||
if not self.DOMAIN or self.DOMAIN == domain or domain.endswith('.'+self.DOMAIN):
|
||||
url = arg
|
||||
else:
|
||||
return None
|
||||
else:
|
||||
url = id2url(arg)
|
||||
if url is None:
|
||||
return None
|
||||
new_args = [url]
|
||||
new_args.extend(args[1:])
|
||||
return func(self, *new_args, **kwargs)
|
||||
return inner
|
||||
return wrapper
|
||||
Loading…
Add table
Add a link
Reference in a new issue