Skip to content

Commit

Permalink
Flake8: remove E125 (Continuation line with same indent as next logic…
Browse files Browse the repository at this point in the history 
…al line)

Also remove E401 from pytest.ini - no occurrences in the codebase
  • Loading branch information
@elacuesta
elacuesta committed May 6, 2020
1 parent fe0c582 commit 6360024
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 37 deletions.
12 changes: 6 additions & 6 deletions pytest.ini
View file
Expand Up @@ -35,7 +35,7 @@ flake8-ignore =
scrapy/commands/check.py E501
scrapy/commands/crawl.py E501
scrapy/commands/edit.py E501
scrapy/commands/fetch.py E401 E501 E128
scrapy/commands/fetch.py E501 E128
scrapy/commands/genspider.py E128 E501
scrapy/commands/parse.py E128 E501
scrapy/commands/runspider.py E501
Expand Down Expand Up @@ -99,7 +99,7 @@ flake8-ignore =
scrapy/pipelines/__init__.py E501
scrapy/pipelines/files.py E116 E501
scrapy/pipelines/images.py E501
scrapy/pipelines/media.py E125 E501
scrapy/pipelines/media.py E501
# scrapy/selector
scrapy/selector/__init__.py F403
scrapy/selector/unified.py E501 E111
Expand Down Expand Up @@ -169,7 +169,7 @@ flake8-ignore =
scrapy/statscollectors.py E501
# tests
tests/__init__.py E402 E501
tests/mockserver.py E401 E501 E126 E123
tests/mockserver.py E501 E126 E123
tests/pipelines.py F841
tests/spiders.py E501
tests/test_closespider.py E501
Expand All @@ -196,7 +196,7 @@ flake8-ignore =
tests/test_downloadermiddleware_robotstxt.py E501
tests/test_downloadermiddleware_stats.py E501
tests/test_dupefilters.py E501 E741 E128 E124
tests/test_engine.py E401 E501 E128
tests/test_engine.py E501 E128
tests/test_exporters.py E501 E128 E124
tests/test_extension_telnet.py F841
tests/test_feedexport.py E501 F841
Expand Down Expand Up @@ -226,7 +226,7 @@ flake8-ignore =
tests/test_spidermiddleware_httperror.py E128 E501 E121
tests/test_spidermiddleware_offsite.py E501 E128 E111
tests/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 E121
tests/test_squeues.py E501 E741
tests/test_utils_asyncio.py E501
tests/test_utils_conf.py E501 E128
Expand All @@ -243,7 +243,7 @@ flake8-ignore =
tests/test_utils_response.py E501
tests/test_utils_signal.py E741 F841
tests/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 E123
tests/test_webclient.py E501 E128 E122 E402 E123 E126
tests/test_cmdline/__init__.py E501
tests/test_settings/__init__.py E501 E128
Expand Down
10 changes: 6 additions & 4 deletions scrapy/pipelines/media.py
View file
Expand Up @@ -43,8 +43,7 @@ def _handle_statuses(self, allow_redirects):
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'
Expand All @@ -55,8 +54,11 @@ def _key_for_pipe(self, key, base_class_name=None,
"""
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 key
return formatted_key

Expand Down
40 changes: 20 additions & 20 deletions tests/test_spidermiddleware_referer.py
View file
Expand Up @@ -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)
Expand Down
14 changes: 7 additions & 7 deletions tests/test_utils_url.py
View file
Expand Up @@ -288,7 +288,7 @@ def test_path(self):
('http://www.example.com',
True,
'http://www.example.com/'),
]:
]:
self.assertEqual(strip_url(input_url, origin_only=origin), output_url)

def test_credentials(self):
Expand All @@ -301,7 +301,7 @@ def test_credentials(self):

('ftp://username:password@www.example.com/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):
Expand All @@ -320,7 +320,7 @@ def test_credentials_encoded_delims(self):
# password: "user@domain.com"
('ftp://me:user%40domain.com@www.example.com/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):
Expand Down Expand Up @@ -348,7 +348,7 @@ def test_default_ports_creds_off(self):

('ftp://username:password@www.example.com:221/file.txt',
'ftp://www.example.com:221/file.txt'),
]:
]:
self.assertEqual(strip_url(i), o)

def test_default_ports(self):
Expand Down Expand Up @@ -376,7 +376,7 @@ def test_default_ports(self):

('ftp://username:password@www.example.com:221/file.txt',
'ftp://username:password@www.example.com:221/file.txt'),
]:
]:
self.assertEqual(strip_url(i, strip_default_port=True, strip_credentials=False), o)

def test_default_ports_keep(self):
Expand Down Expand Up @@ -404,7 +404,7 @@ def test_default_ports_keep(self):

('ftp://username:password@www.example.com:221/file.txt',
'ftp://username:password@www.example.com:221/file.txt'),
]:
]:
self.assertEqual(strip_url(i, strip_default_port=False, strip_credentials=False), o)

def test_origin_only(self):
Expand All @@ -420,7 +420,7 @@ def test_origin_only(self):

('https://username:password@www.example.com:443/index.html',
'https://www.example.com/'),
]:
]:
self.assertEqual(strip_url(i, origin_only=True), o)


Expand Down

0 comments on commit 6360024

Please sign in to comment.