From c0e745e3fd5499f8f44cc6f52d71f77dcd00974a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Tue, 1 Mar 2022 13:30:49 +0100 Subject: [PATCH] Remove Python 3 syntax --- scrapy/downloadermiddlewares/cookies.py | 2 +- scrapy/downloadermiddlewares/redirect.py | 2 +- tests/test_downloadermiddleware_cookies.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scrapy/downloadermiddlewares/cookies.py b/scrapy/downloadermiddlewares/cookies.py index ece182578..5bcee1545 100644 --- a/scrapy/downloadermiddlewares/cookies.py +++ b/scrapy/downloadermiddlewares/cookies.py @@ -35,7 +35,7 @@ class CookiesMiddleware(object): raise NotConfigured return cls(crawler.settings.getbool('COOKIES_DEBUG')) - def _process_cookies(self, cookies, *, jar, request): + def _process_cookies(self, cookies, jar, request): for cookie in cookies: cookie_domain = cookie.domain if cookie_domain.startswith('.'): diff --git a/scrapy/downloadermiddlewares/redirect.py b/scrapy/downloadermiddlewares/redirect.py index 8e16cc9bd..aaa09a01d 100644 --- a/scrapy/downloadermiddlewares/redirect.py +++ b/scrapy/downloadermiddlewares/redirect.py @@ -14,8 +14,8 @@ logger = logging.getLogger(__name__) def _build_redirect_request(source_request, url, **kwargs): redirect_request = source_request.replace( url=url, - **kwargs, cookies=None, + **kwargs, ) if 'Cookie' in redirect_request.headers: source_request_netloc = urlparse_cached(source_request).netloc diff --git a/tests/test_downloadermiddleware_cookies.py b/tests/test_downloadermiddleware_cookies.py index 2f67ff7cf..6863da4e1 100644 --- a/tests/test_downloadermiddleware_cookies.py +++ b/tests/test_downloadermiddleware_cookies.py @@ -30,9 +30,9 @@ def _cookie_to_set_cookie_value(cookie): except UnicodeDecodeError: decoded[key] = cookie[key].decode("latin1", errors="replace") - cookie_str = f"{decoded.pop('name')}={decoded.pop('value')}" + cookie_str = "{}={}".format(decoded.pop('name'), decoded.pop('value')) for key, value in decoded.items(): # path, domain - cookie_str += f"; {key.capitalize()}={value}" + cookie_str += "; {}={}".format(key.capitalize(), value) return cookie_str