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

fix compatibility with python2.6

Browse source
This commit is contained in:
Romain Bignon 2014-05-19 07:23:12 +02:00
commit c409675e6c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
weboob/tools/browser2/browser.py
View file

@ -173,7 +173,7 @@ class BaseBrowser(object):
# try to get an extension (and avoid adding 'None') # try to get an extension (and avoid adding 'None')
ext = mimetypes.guess_extension(mimetype, False) or '' ext = mimetypes.guess_extension(mimetype, False) or ''
path = re.sub('[^A-z0-9\.-_]+', '_', urlparse(response.url).path.rpartition('/')[2])[-10:] path = re.sub(r'[^A-z0-9\.-_]+', '_', urlparse(response.url).path.rpartition('/')[2])[-10:]
if path.endswith(ext): if path.endswith(ext):
ext = '' ext = ''
filename = '%02d-%d%s%s%s' % \ filename = '%02d-%d%s%s%s' % \
@ -345,8 +345,8 @@ class BaseBrowser(object):
if isinstance(req.data, unicode) and data_encoding: if isinstance(req.data, unicode) and data_encoding:
req.data = req.data.encode(data_encoding) req.data = req.data.encode(data_encoding)
if isinstance(req.data, dict) and data_encoding: if isinstance(req.data, dict) and data_encoding:
req.data = {k: v.encode(data_encoding) if isinstance(v, unicode) else v req.data = dict([(k, v.encode(data_encoding)) if isinstance(v, unicode) else v
for k, v in req.data.iteritems()} for k, v in req.data.iteritems()])
if referrer is None: if referrer is None:
referrer = self.get_referrer(self.url, url) referrer = self.get_referrer(self.url, url)
@ -364,7 +364,7 @@ class BaseBrowser(object):
""" """
return self.session.prepare_request(req) return self.session.prepare_request(req)
REFRESH_RE = re.compile("^(?P<sleep>[\d\.]+)(; url=[\"']?(?P<url>.*?)[\"']?)?$", re.IGNORECASE) REFRESH_RE = re.compile(r"^(?P<sleep>[\d\.]+)(; url=[\"']?(?P<url>.*?)[\"']?)?$", re.IGNORECASE)
def handle_refresh(self, response): def handle_refresh(self, response):
""" """