Add support for setting cookies for individual request

CHANGES/2387.feature

@@ -0,0 +1 @@
+Add support for setting cookies for individual request

CONTRIBUTORS.txt

@@ -234,6 +234,7 @@ Yannick Koechlin
 Yannick Péroux
 Ye Cao
 Yegor Roganov
+Yifei Kong
 Young-Ho Cha
 Yuriy Shatrov
 Yury Selivanov

aiohttp/client.py

@@ -237,6 +237,7 @@ async def _request(
             params: Optional[Mapping[str, str]]=None,
             data: Any=None,
             json: Any=None,
+            cookies: Optional[LooseCookies]=None,
             headers: LooseHeaders=None,
             skip_auto_headers: Optional[Iterable[str]]=None,
             auth: Optional[BasicAuth]=None,
@@ -352,7 +353,16 @@ async def _request(
                                          "with AUTH argument or credentials "
                                          "encoded in URL")
 
-                    cookies = self._cookie_jar.filter_cookies(url)
+                    session_cookies = self._cookie_jar.filter_cookies(url)
+
+                    if cookies is not None:
+                        tmp_cookie_jar = CookieJar()
+                        tmp_cookie_jar.update_cookies(cookies)
+                        req_cookies = tmp_cookie_jar.filter_cookies(url)
+                        if session_cookies and req_cookies:
+                            session_cookies.load(req_cookies)
+
+                    cookies = session_cookies
 
                     if proxy is not None:
                         proxy = URL(proxy)

docs/client_reference.rst

@@ -216,7 +216,7 @@ The client session supports the context manager protocol for self closing.
       .. deprecated:: 3.5
 
    .. comethod:: request(method, url, *, params=None, data=None, json=None,\
-                         headers=None, skip_auto_headers=None, \
+                         cookies=None, headers=None, skip_auto_headers=None, \
                          auth=None, allow_redirects=True,\
                          max_redirects=10,\
                          compress=None, chunked=None, expect100=False, raise_for_status=None,\
@@ -255,6 +255,14 @@ The client session supports the context manager protocol for self closing.
                    (optional). *json* and *data* parameters could not
                    be used at the same time.
 
+      :param dict cookies: HTTP Cookies to send with
+                           the request (optional)
+
+         Global session cookies and the explicitly set cookies will be merged
+         when sending the request.
+
+         .. versionadded:: 3.5
+
       :param dict headers: HTTP Headers to send with
                            the request (optional)
 

tests/test_client_functional.py

@@ -1899,6 +1899,33 @@ async def handler(request):
     resp.close()
 
 
+async def test_cookies_per_request(aiohttp_client) -> None:
+
+    async def handler(request):
+        assert request.cookies.keys() == {'test1', 'test3', 'test4', 'test6'}
+        assert request.cookies['test1'] == '123'
+        assert request.cookies['test3'] == '456'
+        assert request.cookies['test4'] == '789'
+        assert request.cookies['test6'] == 'abc'
+        return web.Response()
+
+    c = http.cookies.Morsel()
+    c.set('test3', '456', '456')
+
+    app = web.Application()
+    app.router.add_get('/', handler)
+    client = await aiohttp_client(
+        app, cookies={'test1': '123', 'test2': c})
+
+    rc = http.cookies.Morsel()
+    rc.set('test6', 'abc', 'abc')
+
+    resp = await client.get(
+        '/', cookies={'test4': '789', 'test5': rc})
+    assert 200 == resp.status
+    resp.close()
+
+
 async def test_morsel_with_attributes(aiohttp_client) -> None:
     # A comment from original test:
     #