Skip to content

Scrapy, a fast high-level web crawling & scraping framework for Python.

fix E701 and E271 flake8

Marc Hernandez Cabotb49ece0b8781
diff --git a/pytest.ini b/pytest.ini
index 7806620d5..acdb5a27a 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -128,7 +128,7 @@ flake8-ignore =
scrapy/utils/gz.py E501 W504
scrapy/utils/http.py F403
scrapy/utils/httpobj.py E501
- scrapy/utils/iterators.py E501 E701
+ scrapy/utils/iterators.py E501
scrapy/utils/log.py E128 E501
scrapy/utils/markup.py F403
scrapy/utils/misc.py E501
@@ -141,7 +141,7 @@ flake8-ignore =
scrapy/utils/response.py E501 E128
scrapy/utils/signal.py E501 E128
scrapy/utils/sitemap.py E501
- scrapy/utils/spider.py E271 E501
+ scrapy/utils/spider.py E501
scrapy/utils/ssl.py E501
scrapy/utils/test.py E501
scrapy/utils/url.py E501 F403 E128 F405
@@ -181,7 +181,7 @@ flake8-ignore =
tests/test_crawl.py E501 E741 E265
tests/test_crawler.py F841 E501
tests/test_dependencies.py F841 E501
- tests/test_downloader_handlers.py E124 E127 E128 E265 E501 E701 E126 E123
+ tests/test_downloader_handlers.py E124 E127 E128 E265 E501 E126 E123
tests/test_downloadermiddleware.py E501
tests/test_downloadermiddleware_ajaxcrawlable.py E501
tests/test_downloadermiddleware_cookies.py E731 E741 E501 E128 E265 E126
@@ -204,7 +204,7 @@ flake8-ignore =
tests/test_http_headers.py E501
tests/test_http_request.py E402 E501 E127 E128 E128 E126 E123
tests/test_http_response.py E501 E128 E265
- tests/test_item.py E701 E128 F841
+ tests/test_item.py E128 F841
tests/test_link.py E501
tests/test_linkextractors.py E501 E128 E124
tests/test_loader.py E501 E731 E741 E128 E117 E241
@@ -212,7 +212,7 @@ flake8-ignore =
tests/test_mail.py E128 E501
tests/test_middleware.py E501 E128
tests/test_pipeline_crawl.py E131 E501 E128 E126
- tests/test_pipeline_files.py E501 E272
+ tests/test_pipeline_files.py E501
tests/test_pipeline_images.py F841 E501
tests/test_pipeline_media.py E501 E741 E731 E128 E502
tests/test_proxy_connect.py E501 E741
@@ -227,7 +227,7 @@ flake8-ignore =
tests/test_spidermiddleware_offsite.py E501 E128 E111
tests/test_spidermiddleware_output_chain.py E501
tests/test_spidermiddleware_referer.py E501 F841 E125 E201 E124 E501 E241 E121
- tests/test_squeues.py E501 E701 E741
+ tests/test_squeues.py E501 E741
tests/test_utils_asyncio.py E501
tests/test_utils_conf.py E501 E128
tests/test_utils_curl.py E501
@@ -237,7 +237,7 @@ flake8-ignore =
tests/test_utils_http.py E501 E128 W504
tests/test_utils_iterators.py E501 E128 E129 E241
tests/test_utils_log.py E741
- tests/test_utils_python.py E501 E731 E701
+ tests/test_utils_python.py E501 E731
tests/test_utils_reqser.py E501 E128
tests/test_utils_request.py E501 E128
tests/test_utils_response.py E501
diff --git a/scrapy/utils/iterators.py b/scrapy/utils/iterators.py
index 3c0cb68c3..7849174fb 100644
--- a/scrapy/utils/iterators.py
+++ b/scrapy/utils/iterators.py
@@ -101,8 +101,10 @@ def csviter(obj, delimiter=None, headers=None, encoding=None, quotechar=None):
lines = StringIO(_body_or_str(obj, unicode=True))
kwargs = {}
- if delimiter: kwargs["delimiter"] = delimiter
- if quotechar: kwargs["quotechar"] = quotechar
+ if delimiter:
+ kwargs["delimiter"] = delimiter
+ if quotechar:
+ kwargs["quotechar"] = quotechar
csv_r = csv.reader(lines, **kwargs)
if not headers:
diff --git a/tests/test_item.py b/tests/test_item.py
index 823bf1ced..f70632d57 100644
--- a/tests/test_item.py
+++ b/tests/test_item.py
@@ -149,13 +149,15 @@ class ItemTest(unittest.TestCase):
fields = {'load': Field(default='A')}
save = Field(default='A')
- class B(A): pass
+ class B(A):
+ pass
class C(Item):
fields = {'load': Field(default='C')}
save = Field(default='C')
- class D(B, C): pass
+ class D(B, C):
+ pass
item = D(save='X', load='Y')
self.assertEqual(item['save'], 'X')
@@ -164,7 +166,8 @@ class ItemTest(unittest.TestCase):
'save': {'default': 'A'}})
# D class inverted
- class E(C, B): pass
+ class E(C, B):
+ pass
self.assertEqual(E(save='X')['save'], 'X')
self.assertEqual(E(load='X')['load'], 'X')
@@ -177,7 +180,8 @@ class ItemTest(unittest.TestCase):
save = Field(default='A')
load = Field(default='A')
- class B(A): pass
+ class B(A):
+ pass
class C(A):
fields = {'update': Field(default='C')}
@@ -206,14 +210,16 @@ class ItemTest(unittest.TestCase):
fields = {'load': Field(default='A')}
save = Field(default='A')
- class B(A): pass
+ class B(A):
+ pass
class C(object):
fields = {'load': Field(default='C')}
not_allowed = Field(default='not_allowed')
save = Field(default='C')
- class D(B, C): pass
+ class D(B, C):
+ pass
self.assertRaises(KeyError, D, not_allowed='value')
self.assertEqual(D(save='X')['save'], 'X')
@@ -221,7 +227,8 @@ class ItemTest(unittest.TestCase):
'load': {'default': 'A'}})
# D class inverted
- class E(C, B): pass
+ class E(C, B):
+ pass
self.assertRaises(KeyError, E, not_allowed='value')
self.assertEqual(E(save='X')['save'], 'X')
diff --git a/tests/test_pipeline_files.py b/tests/test_pipeline_files.py
index 799782647..f155db4ce 100644
--- a/tests/test_pipeline_files.py
+++ b/tests/test_pipeline_files.py
@@ -272,7 +272,7 @@ class FilesPipelineTestCaseCustomSettings(unittest.TestCase):
prefix = pipeline_cls.__name__.upper()
settings = self._generate_fake_settings(prefix=prefix)
user_pipeline = pipeline_cls.from_settings(Settings(settings))
- for pipe_cls_attr, settings_attr, pipe_inst_attr in self.file_cls_attr_settings_map:
+ for pipe_cls_attr, settings_attr, pipe_inst_attr in self.file_cls_attr_settings_map:
custom_value = settings.get(prefix + "_" + settings_attr)
self.assertNotEqual(custom_value, self.default_cls_settings[pipe_cls_attr])
self.assertEqual(getattr(user_pipeline, pipe_inst_attr), custom_value)
diff --git a/tests/test_squeues.py b/tests/test_squeues.py
index d5fcf2f7f..f6970162e 100644
--- a/tests/test_squeues.py
+++ b/tests/test_squeues.py
@@ -31,7 +31,9 @@ def nonserializable_object_test(self):
self.assertRaises(ValueError, q.push, lambda x: x)
else:
# Use a different unpickleable object
- class A(object): pass
+ class A(object):
+ pass
+
a = A()
a.__reduce__ = a.__reduce_ex__ = None
self.assertRaises(ValueError, q.push, a)
diff --git a/tests/test_utils_python.py b/tests/test_utils_python.py
index 4202e8c89..ec5b4c596 100644
--- a/tests/test_utils_python.py
+++ b/tests/test_utils_python.py
@@ -153,7 +153,9 @@ class UtilsPythonTestCase(unittest.TestCase):
self.assertFalse(equal_attributes(a, b, [compare_z, 'x']))
def test_weakkeycache(self):
- class _Weakme(object): pass
+ class _Weakme(object):
+ pass
+
_values = count()
wk = WeakKeyCache(lambda k: next(_values))
k = _Weakme()