From c4b22a5817863321cabc0f7228271d3e4b9dbf68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Tue, 1 Mar 2022 13:38:00 +0100 Subject: [PATCH] Remove further Python 3 syntax --- scrapy/downloadermiddlewares/redirect.py | 8 +++----- tests/test_downloadermiddleware_cookies.py | 4 ---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/scrapy/downloadermiddlewares/redirect.py b/scrapy/downloadermiddlewares/redirect.py index aaa09a01d..300041617 100644 --- a/scrapy/downloadermiddlewares/redirect.py +++ b/scrapy/downloadermiddlewares/redirect.py @@ -12,11 +12,9 @@ logger = logging.getLogger(__name__) def _build_redirect_request(source_request, url, **kwargs): - redirect_request = source_request.replace( - url=url, - cookies=None, - **kwargs, - ) + kwargs['url'] = url + kwargs['cookies'] = None + redirect_request = source_request.replace(**kwargs) if 'Cookie' in redirect_request.headers: source_request_netloc = urlparse_cached(source_request).netloc redirect_request_netloc = urlparse_cached(redirect_request).netloc diff --git a/tests/test_downloadermiddleware_cookies.py b/tests/test_downloadermiddleware_cookies.py index 6863da4e1..ec220f930 100644 --- a/tests/test_downloadermiddleware_cookies.py +++ b/tests/test_downloadermiddleware_cookies.py @@ -280,7 +280,6 @@ class CookiesMiddlewareTest(TestCase): self, source, target, - *, cookies1, cookies2, ): @@ -355,7 +354,6 @@ class CookiesMiddlewareTest(TestCase): self, source, target, - *, cookies2, ): """Test the handling of a user-defined Cookie header when building a @@ -432,7 +430,6 @@ class CookiesMiddlewareTest(TestCase): url1, url2, domain, - *, cookies1, cookies2, ): @@ -495,7 +492,6 @@ class CookiesMiddlewareTest(TestCase): url1, url2, domain, - *, cookies, ): request1 = Request(url1)