Scrapy, a fast high-level web crawling & scraping framework for Python.
Flake8: remove E125 (Continuation line with same indent as next logical line)
Eugenio Lacuesta63600243e08c
diff --git a/pytest.ini b/pytest.iniindex 3eefe70f1..8ed1ad0cf 100644--- a/pytest.ini+++ b/pytest.ini@@ -35,7 +35,7 @@ flake8-ignore =scrapy/commands/check.py E501scrapy/commands/crawl.py E501scrapy/commands/edit.py E501- scrapy/commands/fetch.py E401 E501 E128+ scrapy/commands/fetch.py E501 E128scrapy/commands/genspider.py E128 E501scrapy/commands/parse.py E128 E501scrapy/commands/runspider.py E501@@ -99,7 +99,7 @@ flake8-ignore =scrapy/pipelines/__init__.py E501scrapy/pipelines/files.py E116 E501scrapy/pipelines/images.py E501- scrapy/pipelines/media.py E125 E501+ scrapy/pipelines/media.py E501# scrapy/selectorscrapy/selector/__init__.py F403scrapy/selector/unified.py E501 E111@@ -169,7 +169,7 @@ flake8-ignore =scrapy/statscollectors.py E501# teststests/__init__.py E402 E501- tests/mockserver.py E401 E501 E126 E123+ tests/mockserver.py E501 E126 E123tests/pipelines.py F841tests/spiders.py E501tests/test_closespider.py E501@@ -196,7 +196,7 @@ flake8-ignore =tests/test_downloadermiddleware_robotstxt.py E501tests/test_downloadermiddleware_stats.py E501tests/test_dupefilters.py E501 E741 E128 E124- tests/test_engine.py E401 E501 E128+ tests/test_engine.py E501 E128tests/test_exporters.py E501 E128 E124tests/test_extension_telnet.py F841tests/test_feedexport.py E501 F841@@ -226,7 +226,7 @@ flake8-ignore =tests/test_spidermiddleware_httperror.py E128 E501 E121tests/test_spidermiddleware_offsite.py E501 E128 E111tests/test_spidermiddleware_output_chain.py E501- tests/test_spidermiddleware_referer.py E501 F841 E125 E124 E501 E121+ tests/test_spidermiddleware_referer.py E501 F841 E124 E501 E121tests/test_squeues.py E501 E741tests/test_utils_asyncio.py E501tests/test_utils_conf.py E501 E128@@ -243,7 +243,7 @@ flake8-ignore =tests/test_utils_response.py E501tests/test_utils_signal.py E741 F841tests/test_utils_sitemap.py E128 E501 E124- tests/test_utils_url.py E501 E125 E501 E126 E123+ tests/test_utils_url.py E501 E501 E126 E123tests/test_webclient.py E501 E128 E122 E402 E123 E126tests/test_cmdline/__init__.py E501tests/test_settings/__init__.py E501 E128diff --git a/scrapy/pipelines/media.py b/scrapy/pipelines/media.pyindex 8a0636264..aa65f4f0e 100644--- a/scrapy/pipelines/media.py+++ b/scrapy/pipelines/media.py@@ -43,8 +43,7 @@ class MediaPipeline:if allow_redirects:self.handle_httpstatus_list = SequenceExclude(range(300, 400))- def _key_for_pipe(self, key, base_class_name=None,- settings=None):+ def _key_for_pipe(self, key, base_class_name=None, settings=None):""">>> MediaPipeline()._key_for_pipe("IMAGES")'IMAGES'@@ -55,8 +54,11 @@ class MediaPipeline:"""class_name = self.__class__.__name__formatted_key = "{}_{}".format(class_name.upper(), key)- if class_name == base_class_name or not base_class_name \- or (settings and not settings.get(formatted_key)):+ if (+ not base_class_name+ or class_name == base_class_name+ or settings and not settings.get(formatted_key)+ ):return keyreturn formatted_keydiff --git a/tests/test_spidermiddleware_referer.py b/tests/test_spidermiddleware_referer.pyindex 742adc64f..41589177a 100644--- a/tests/test_spidermiddleware_referer.py+++ b/tests/test_spidermiddleware_referer.py@@ -478,32 +478,32 @@ class TestSettingsPolicyByName(TestCase):def test_valid_name(self):for s, p in [- (POLICY_SCRAPY_DEFAULT, DefaultReferrerPolicy),- (POLICY_NO_REFERRER, NoReferrerPolicy),- (POLICY_NO_REFERRER_WHEN_DOWNGRADE, NoReferrerWhenDowngradePolicy),- (POLICY_SAME_ORIGIN, SameOriginPolicy),- (POLICY_ORIGIN, OriginPolicy),- (POLICY_STRICT_ORIGIN, StrictOriginPolicy),- (POLICY_ORIGIN_WHEN_CROSS_ORIGIN, OriginWhenCrossOriginPolicy),- (POLICY_STRICT_ORIGIN_WHEN_CROSS_ORIGIN, StrictOriginWhenCrossOriginPolicy),- (POLICY_UNSAFE_URL, UnsafeUrlPolicy),- ]:+ (POLICY_SCRAPY_DEFAULT, DefaultReferrerPolicy),+ (POLICY_NO_REFERRER, NoReferrerPolicy),+ (POLICY_NO_REFERRER_WHEN_DOWNGRADE, NoReferrerWhenDowngradePolicy),+ (POLICY_SAME_ORIGIN, SameOriginPolicy),+ (POLICY_ORIGIN, OriginPolicy),+ (POLICY_STRICT_ORIGIN, StrictOriginPolicy),+ (POLICY_ORIGIN_WHEN_CROSS_ORIGIN, OriginWhenCrossOriginPolicy),+ (POLICY_STRICT_ORIGIN_WHEN_CROSS_ORIGIN, StrictOriginWhenCrossOriginPolicy),+ (POLICY_UNSAFE_URL, UnsafeUrlPolicy),+ ]:settings = Settings({'REFERRER_POLICY': s})mw = RefererMiddleware(settings)self.assertEqual(mw.default_policy, p)def test_valid_name_casevariants(self):for s, p in [- (POLICY_SCRAPY_DEFAULT, DefaultReferrerPolicy),- (POLICY_NO_REFERRER, NoReferrerPolicy),- (POLICY_NO_REFERRER_WHEN_DOWNGRADE, NoReferrerWhenDowngradePolicy),- (POLICY_SAME_ORIGIN, SameOriginPolicy),- (POLICY_ORIGIN, OriginPolicy),- (POLICY_STRICT_ORIGIN, StrictOriginPolicy),- (POLICY_ORIGIN_WHEN_CROSS_ORIGIN, OriginWhenCrossOriginPolicy),- (POLICY_STRICT_ORIGIN_WHEN_CROSS_ORIGIN, StrictOriginWhenCrossOriginPolicy),- (POLICY_UNSAFE_URL, UnsafeUrlPolicy),- ]:+ (POLICY_SCRAPY_DEFAULT, DefaultReferrerPolicy),+ (POLICY_NO_REFERRER, NoReferrerPolicy),+ (POLICY_NO_REFERRER_WHEN_DOWNGRADE, NoReferrerWhenDowngradePolicy),+ (POLICY_SAME_ORIGIN, SameOriginPolicy),+ (POLICY_ORIGIN, OriginPolicy),+ (POLICY_STRICT_ORIGIN, StrictOriginPolicy),+ (POLICY_ORIGIN_WHEN_CROSS_ORIGIN, OriginWhenCrossOriginPolicy),+ (POLICY_STRICT_ORIGIN_WHEN_CROSS_ORIGIN, StrictOriginWhenCrossOriginPolicy),+ (POLICY_UNSAFE_URL, UnsafeUrlPolicy),+ ]:settings = Settings({'REFERRER_POLICY': s.upper()})mw = RefererMiddleware(settings)self.assertEqual(mw.default_policy, p)diff --git a/tests/test_utils_url.py b/tests/test_utils_url.pyindex 3bb6d40db..bed1a5634 100644--- a/tests/test_utils_url.py+++ b/tests/test_utils_url.py@@ -288,7 +288,7 @@ class StripUrl(unittest.TestCase):('http://www.example.com',True,'http://www.example.com/'),- ]:+ ]:self.assertEqual(strip_url(input_url, origin_only=origin), output_url)def test_credentials(self):@@ -301,7 +301,7 @@ class StripUrl(unittest.TestCase):('ftp://username:[email protected]/index.html?somekey=somevalue#section','ftp://www.example.com/index.html?somekey=somevalue'),- ]:+ ]:self.assertEqual(strip_url(i, strip_credentials=True), o)def test_credentials_encoded_delims(self):@@ -320,7 +320,7 @@ class StripUrl(unittest.TestCase):# password: "[email protected]"('ftp://me:user%[email protected]/index.html?somekey=somevalue#section','ftp://www.example.com/index.html?somekey=somevalue'),- ]:+ ]:self.assertEqual(strip_url(i, strip_credentials=True), o)def test_default_ports_creds_off(self):@@ -348,7 +348,7 @@ class StripUrl(unittest.TestCase):('ftp://username:[email protected]:221/file.txt','ftp://www.example.com:221/file.txt'),- ]:+ ]:self.assertEqual(strip_url(i), o)def test_default_ports(self):@@ -376,7 +376,7 @@ class StripUrl(unittest.TestCase):('ftp://username:[email protected]:221/file.txt','ftp://username:[email protected]:221/file.txt'),- ]:+ ]:self.assertEqual(strip_url(i, strip_default_port=True, strip_credentials=False), o)def test_default_ports_keep(self):@@ -404,7 +404,7 @@ class StripUrl(unittest.TestCase):('ftp://username:[email protected]:221/file.txt','ftp://username:[email protected]:221/file.txt'),- ]:+ ]:self.assertEqual(strip_url(i, strip_default_port=False, strip_credentials=False), o)def test_origin_only(self):@@ -420,7 +420,7 @@ class StripUrl(unittest.TestCase):('https://username:[email protected]:443/index.html','https://www.example.com/'),- ]:+ ]:self.assertEqual(strip_url(i, origin_only=True), o)