Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip default headers #486

Merged
merged 11 commits into from
Sep 3, 2015
Merged

Skip default headers #486

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bc431fc
Add skip_auto_headers parameter
asvetlov Aug 29, 2015
0b17644
Merge passed and default skip lists for client headers
asvetlov Aug 29, 2015
b6bfb7a
Write functional tests for skipping headers
asvetlov Aug 31, 2015
ce4150a
Add skip_auto_headers check for content-type
asvetlov Aug 31, 2015
cae1d2c
Merge branch 'master' into skip_default_headers
asvetlov Sep 2, 2015
82efc7c
Fix pep8
asvetlov Sep 2, 2015
b2fa1d0
Cleanup code
asvetlov Sep 2, 2015
568adcf
More tests
asvetlov Sep 2, 2015
085cb8e
Merge branch 'master' into skip_default_headers
asvetlov Sep 2, 2015
3f82d25
Document skip_auto_headers parameter
asvetlov Sep 3, 2015
5c5743e
Update CHANGES
asvetlov Sep 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge passed and default skip lists for client headers
  • Loading branch information
@asvetlov
asvetlov committed Aug 29, 2015
commit 0b17644a24dfc2febaf05ffaeddfe42dd102aee4
10 changes: 8 additions & 2 deletions aiohttp/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ def __init__(self, *, connector=None, loop=None, cookies=None,
headers = CIMultiDict()
self._default_headers = headers
if skip_auto_headers is not None:
self._skip_auto_headers = frozenset(skip_auto_headers)
self._skip_auto_headers = frozenset([upstr(i)
for i in skip_auto_headers])
else:
self._skip_auto_headers = frozenset()

Expand Down Expand Up @@ -125,10 +126,15 @@ def request(self, method, url, *,
raise ValueError("Can't combine `Authorization` header with "
"`auth` argument")

skip_headers = self._skip_auto_headers
if skip_auto_headers is not None:
for i in self.skip_auto_headers:
skip_headers.add(upstr(i))

while True:
req = self._request_class(
method, url, params=params, headers=headers,
skip_auto_headers=skip_auto_headers, data=data,
skip_auto_headers=skip_headers, data=data,
cookies=self.cookies, files=files, encoding=encoding,
auth=auth, version=version, compress=compress, chunked=chunked,
expect100=expect100,
Expand Down
32 changes: 29 additions & 3 deletions tests/test_client_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import aiohttp
from aiohttp.client import ClientSession
from aiohttp.multidict import MultiDict, CIMultiDict, CIMultiDictProxy
from aiohttp.multidict import MultiDict, CIMultiDict, CIMultiDictProxy, upstr
from aiohttp.connector import BaseConnector, TCPConnector
from aiohttp.client_reqrep import ClientRequest, ClientResponse
from http.cookies import SimpleCookie
Expand Down Expand Up @@ -141,8 +141,8 @@ def test_merge_headers_with_list_of_tuples(self):
]))
session.close()

def _make_one(self):
session = ClientSession(loop=self.loop)
def _make_one(self, **kwargs):
session = ClientSession(loop=self.loop, **kwargs)
params = dict(
headers={"Authorization": "Basic ..."},
max_redirects=2,
Expand Down Expand Up @@ -375,6 +375,32 @@ def test_borrow_connector_loop(self):
session = ClientSession(connector=conn)
self.assertIs(session._loop, self.loop)

@mock.patch("aiohttp.client.ClientSession.request")
def test_skip_auto_headers(self, patched):
session, params = self._make_one()
skip = [upstr('user-agent')]
self.run(session.get("http://example.com",
skip_auto_headers=skip,
**params))
params['skip_auto_headers'] = skip
self.assertTrue(patched.called, "`ClientSession.request` not called")
self.assertEqual(patched.call_args[1]['skip_auto_headers'], skip)
session.close()

@mock.patch("aiohttp.client.ClientSession.request")
def test_skip_auto_headers_default(self, patched):
skip = ['user-agent']
uskip = [upstr(i) for i in skip]
import ipdb;ipdb.set_trace()
session, params = self._make_one(skip_auto_headers=skip)
self.run(session.get("http://example.com",
**params))
params['skip_auto_headers'] = skip
self.assertTrue(patched.called, "`ClientSession.request` not called")
print(patched.call_args)
self.assertEqual(patched.call_args[1]['skip_auto_headers'], uskip)
session.close()


class TestCLientRequest(unittest.TestCase):

Expand Down