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

Some PEP8 fixes

Browse source
This commit is contained in:
Laurent Bachelier 2012-12-03 21:12:21 +01:00 • committed by Romain Bignon
commit 61e7b93779
2 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,7 +79,8 @@ class Firefox(Profile):
# Replace all base requests headers # Replace all base requests headers
# https://developer.mozilla.org/en/Gecko_user_agent_string_reference # https://developer.mozilla.org/en/Gecko_user_agent_string_reference
# https://bugzilla.mozilla.org/show_bug.cgi?id=572650 # https://bugzilla.mozilla.org/show_bug.cgi?id=572650
session.config['base_headers'] = {'Accept-Language': 'en-us,en;q=0.5', session.config['base_headers'] = {
'Accept-Language': 'en-us,en;q=0.5',
'Accept-Encoding': 'gzip, deflate', 'Accept-Encoding': 'gzip, deflate',
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:10.0.3) Gecko/20100101 Firefox/10.0.3', 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:10.0.3) Gecko/20100101 Firefox/10.0.3',
@ -100,7 +101,8 @@ class Wget(Profile):
def setup_session(self, session): def setup_session(self, session):
# Don't remove base headers, if websites want to block fake browsers, # Don't remove base headers, if websites want to block fake browsers,
# they will probably block any wget user agent anyway. # they will probably block any wget user agent anyway.
session.config['base_headers'].update({'Accept': '*/*', session.config['base_headers'].update({
'Accept': '*/*',
'User-Agent': 'Wget/%s' % self.version}) 'User-Agent': 'Wget/%s' % self.version})
session.config['keep_alive'] = True session.config['keep_alive'] = True

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

@ -83,15 +83,15 @@ def test_redirects():
assert r.history[1].request.url == HTTPBIN + 'redirect/3' assert r.history[1].request.url == HTTPBIN + 'redirect/3'
assert r.history[1].request.headers.get('Referer') == HTTPBIN + 'redirect/4' assert r.history[1].request.headers.get('Referer') == HTTPBIN + 'redirect/4'
assert r.history[0].request.url == HTTPBIN + 'redirect/4' assert r.history[0].request.url == HTTPBIN + 'redirect/4'
assert r.history[0].request.headers.get('Referer') == None assert r.history[0].request.headers.get('Referer') is None
assert r.url == HTTPBIN + 'get' assert r.url == HTTPBIN + 'get'
# Disable all referers # Disable all referers
r = b.location(HTTPBIN + 'redirect/2', referrer=False) r = b.location(HTTPBIN + 'redirect/2', referrer=False)
assert json.loads(r.text)['headers'].get('Referer') == None assert json.loads(r.text)['headers'].get('Referer') is None
assert len(r.history) == 2 assert len(r.history) == 2
assert r.history[1].request.headers.get('Referer') == None assert r.history[1].request.headers.get('Referer') is None
assert r.history[0].request.headers.get('Referer') == None assert r.history[0].request.headers.get('Referer') is None
assert r.url == HTTPBIN + 'get' assert r.url == HTTPBIN + 'get'
# Only overrides first referer # Only overrides first referer