Scrapy, a fast high-level web crawling & scraping framework for Python.
Flake8: Remove E124
Eugenio Lacuestacc23d1cb5807
diff --git a/pytest.ini b/pytest.iniindex f8c4ce19a..998633d54 100644--- a/pytest.ini+++ b/pytest.ini@@ -88,7 +88,7 @@ flake8-ignore =scrapy/http/request/form.py E501scrapy/http/request/json_request.py E501scrapy/http/response/__init__.py E501 E128- scrapy/http/response/text.py E501 E128 E124+ scrapy/http/response/text.py E501 E128# scrapy/linkextractorsscrapy/linkextractors/__init__.py E501 E402scrapy/linkextractors/lxmlhtml.py E501@@ -181,7 +181,7 @@ flake8-ignore =tests/test_crawl.py E501 E741tests/test_crawler.py F841 E501tests/test_dependencies.py F841 E501- tests/test_downloader_handlers.py E124 E128 E501 E126+ tests/test_downloader_handlers.py E128 E501 E126tests/test_downloadermiddleware.py E501tests/test_downloadermiddleware_ajaxcrawlable.py E501tests/test_downloadermiddleware_cookies.py E741 E501 E128 E126@@ -195,9 +195,9 @@ flake8-ignore =tests/test_downloadermiddleware_retry.py E501 E128 E126tests/test_downloadermiddleware_robotstxt.py E501tests/test_downloadermiddleware_stats.py E501- tests/test_dupefilters.py E501 E741 E128 E124+ tests/test_dupefilters.py E501 E741 E128tests/test_engine.py E501 E128- tests/test_exporters.py E501 E128 E124+ tests/test_exporters.py E501 E128tests/test_extension_telnet.py F841tests/test_feedexport.py E501 F841tests/test_http_cookies.py E501@@ -206,7 +206,7 @@ flake8-ignore =tests/test_http_response.py E501 E128tests/test_item.py E128 F841tests/test_link.py E501- tests/test_linkextractors.py E501 E128 E124+ tests/test_linkextractors.py E501 E128tests/test_loader.py E501 E741 E128 E117tests/test_logformatter.py E128 E501tests/test_mail.py E128 E501@@ -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 E124 E501 E121+ tests/test_spidermiddleware_referer.py E501 F841 E501 E121tests/test_squeues.py E501 E741tests/test_utils_asyncio.py E501tests/test_utils_conf.py E501 E128@@ -242,7 +242,7 @@ flake8-ignore =tests/test_utils_request.py E501 E128tests/test_utils_response.py E501tests/test_utils_signal.py E741 F841- tests/test_utils_sitemap.py E128 E501 E124+ tests/test_utils_sitemap.py E128 E501tests/test_utils_url.py E501 E501 E126tests/test_webclient.py E501 E128 E402 E126tests/test_cmdline/__init__.py E501diff --git a/tests/test_dupefilters.py b/tests/test_dupefilters.pyindex ea0e664be..7426107c1 100644--- a/tests/test_dupefilters.py+++ b/tests/test_dupefilters.py@@ -197,8 +197,7 @@ class RFPDupeFilterTest(unittest.TestCase):r1 = Request('http://scrapytest.org/index.html')r2 = Request('http://scrapytest.org/index.html',- headers={'Referer': 'http://scrapytest.org/INDEX.html'}- )+ headers={'Referer': 'http://scrapytest.org/INDEX.html'})dupefilter.log(r1, spider)dupefilter.log(r2, spider)diff --git a/tests/test_exporters.py b/tests/test_exporters.pyindex 160912847..0f9dafcaa 100644--- a/tests/test_exporters.py+++ b/tests/test_exporters.py@@ -342,20 +342,22 @@ class XmlItemExporterTest(BaseItemExporterTest):i2 = dict(name=u'bar', age=i1)i3 = TestItem(name=u'buz', age=i2)- self.assertExportResult(i3,- b'<?xml version="1.0" encoding="utf-8"?>\n'- b'<items>'- b'<item>'- b'<age>'- b'<age>'- b'<age>22</age>'- b'<name>foo\xc2\xa3hoo</name>'- b'</age>'- b'<name>bar</name>'- b'</age>'- b'<name>buz</name>'- b'</item>'- b'</items>'+ self.assertExportResult(+ i3,+ b"""<?xml version="1.0" encoding="utf-8"?>\n+ <items>+ <item>+ <age>+ <age>+ <age>22</age>+ <name>foo\xc2\xa3hoo</name>+ </age>+ <name>bar</name>+ </age>+ <name>buz</name>+ </item>+ </items>+ """)def test_nested_list_item(self):@@ -363,31 +365,35 @@ class XmlItemExporterTest(BaseItemExporterTest):i2 = dict(name=u'bar', v2={"egg": ["spam"]})i3 = TestItem(name=u'buz', age=[i1, i2])- self.assertExportResult(i3,- b'<?xml version="1.0" encoding="utf-8"?>\n'- b'<items>'- b'<item>'- b'<age>'- b'<value><name>foo</name></value>'- b'<value><name>bar</name><v2><egg><value>spam</value></egg></v2></value>'- b'</age>'- b'<name>buz</name>'- b'</item>'- b'</items>'+ self.assertExportResult(+ i3,+ b"""<?xml version="1.0" encoding="utf-8"?>\n+ <items>+ <item>+ <age>+ <value><name>foo</name></value>+ <value><name>bar</name><v2><egg><value>spam</value></egg></v2></value>+ </age>+ <name>buz</name>+ </item>+ </items>+ """)def test_nonstring_types_item(self):item = self._get_nonstring_types_item()- self.assertExportResult(item,- b'<?xml version="1.0" encoding="utf-8"?>\n'- b'<items>'- b'<item>'- b'<float>3.14</float>'- b'<boolean>False</boolean>'- b'<number>22</number>'- b'<time>2015-01-01 01:01:01</time>'- b'</item>'- b'</items>'+ self.assertExportResult(+ item,+ b"""<?xml version="1.0" encoding="utf-8"?>\n+ <items>+ <item>+ <float>3.14</float>+ <boolean>False</boolean>+ <number>22</number>+ <time>2015-01-01 01:01:01</time>+ </item>+ </items>+ """)diff --git a/tests/test_linkextractors.py b/tests/test_linkextractors.pyindex 53968e60e..68e8514ba 100644--- a/tests/test_linkextractors.py+++ b/tests/test_linkextractors.py@@ -413,24 +413,30 @@ class Base:response = HtmlResponse("http://example.com/index.xhtml", body=xhtml)lx = self.extractor_cls()- self.assertEqual(lx.extract_links(response),- [Link(url='http://example.com/about.html', text=u'About us', fragment='', nofollow=False),- Link(url='http://example.com/follow.html', text=u'Follow this link', fragment='', nofollow=False),- Link(url='http://example.com/nofollow.html', text=u'Dont follow this one', fragment='', nofollow=True),- Link(url='http://example.com/nofollow2.html', text=u'Choose to follow or not', fragment='', nofollow=False),- Link(url='http://google.com/something', text=u'External link not to follow', nofollow=True)]- )+ self.assertEqual(+ lx.extract_links(response),+ [+ Link(url='http://example.com/about.html', text=u'About us', fragment='', nofollow=False),+ Link(url='http://example.com/follow.html', text=u'Follow this link', fragment='', nofollow=False),+ Link(url='http://example.com/nofollow.html', text=u'Dont follow this one', fragment='', nofollow=True),+ Link(url='http://example.com/nofollow2.html', text=u'Choose to follow or not', fragment='', nofollow=False),+ Link(url='http://google.com/something', text=u'External link not to follow', nofollow=True),+ ]+ )response = XmlResponse("http://example.com/index.xhtml", body=xhtml)lx = self.extractor_cls()- self.assertEqual(lx.extract_links(response),- [Link(url='http://example.com/about.html', text=u'About us', fragment='', nofollow=False),- Link(url='http://example.com/follow.html', text=u'Follow this link', fragment='', nofollow=False),- Link(url='http://example.com/nofollow.html', text=u'Dont follow this one', fragment='', nofollow=True),- Link(url='http://example.com/nofollow2.html', text=u'Choose to follow or not', fragment='', nofollow=False),- Link(url='http://google.com/something', text=u'External link not to follow', nofollow=True)]- )+ self.assertEqual(+ lx.extract_links(response),+ [+ Link(url='http://example.com/about.html', text=u'About us', fragment='', nofollow=False),+ Link(url='http://example.com/follow.html', text=u'Follow this link', fragment='', nofollow=False),+ Link(url='http://example.com/nofollow.html', text=u'Dont follow this one', fragment='', nofollow=True),+ Link(url='http://example.com/nofollow2.html', text=u'Choose to follow or not', fragment='', nofollow=False),+ Link(url='http://google.com/something', text=u'External link not to follow', nofollow=True),+ ]+ )def test_link_wrong_href(self):html = b"""diff --git a/tests/test_utils_sitemap.py b/tests/test_utils_sitemap.pyindex db323ab31..08b215434 100644--- a/tests/test_utils_sitemap.py+++ b/tests/test_utils_sitemap.py@@ -58,10 +58,13 @@ class SitemapTest(unittest.TestCase):</url></urlset>""")- self.assertEqual(list(s),- [{'priority': '1', 'loc': 'http://www.example.com/', 'lastmod': '2009-08-16', 'changefreq': 'daily'},- {'loc': 'http://www.example.com/2', 'lastmod': ''},- ])+ self.assertEqual(+ list(s),+ [+ {'priority': '1', 'loc': 'http://www.example.com/', 'lastmod': '2009-08-16', 'changefreq': 'daily'},+ {'loc': 'http://www.example.com/2', 'lastmod': ''},+ ]+ )def test_sitemap_wrong_ns(self):"""We have seen sitemaps with wrongs ns. Presumably, Google still works@@ -80,10 +83,13 @@ class SitemapTest(unittest.TestCase):</url></urlset>""")- self.assertEqual(list(s),- [{'priority': '1', 'loc': 'http://www.example.com/', 'lastmod': '2009-08-16', 'changefreq': 'daily'},- {'loc': 'http://www.example.com/2', 'lastmod': ''},- ])+ self.assertEqual(+ list(s),+ [+ {'priority': '1', 'loc': 'http://www.example.com/', 'lastmod': '2009-08-16', 'changefreq': 'daily'},+ {'loc': 'http://www.example.com/2', 'lastmod': ''},+ ]+ )def test_sitemap_wrong_ns2(self):"""We have seen sitemaps with wrongs ns. Presumably, Google still works@@ -103,10 +109,13 @@ class SitemapTest(unittest.TestCase):</urlset>""")assert s.type == 'urlset'- self.assertEqual(list(s),- [{'priority': '1', 'loc': 'http://www.example.com/', 'lastmod': '2009-08-16', 'changefreq': 'daily'},- {'loc': 'http://www.example.com/2', 'lastmod': ''},- ])+ self.assertEqual(+ list(s),+ [+ {'priority': '1', 'loc': 'http://www.example.com/', 'lastmod': '2009-08-16', 'changefreq': 'daily'},+ {'loc': 'http://www.example.com/2', 'lastmod': ''},+ ]+ )def test_sitemap_urls_from_robots(self):robots = """User-agent: *@@ -195,11 +204,19 @@ Disallow: /forum/active/</url></urlset>""")- self.assertEqual(list(s), [- {'loc': 'http://www.example.com/english/',- 'alternate': ['http://www.example.com/deutsch/', 'http://www.example.com/schweiz-deutsch/', 'http://www.example.com/english/']- }- ])+ self.assertEqual(+ list(s),+ [+ {+ 'loc': 'http://www.example.com/english/',+ 'alternate': [+ 'http://www.example.com/deutsch/',+ 'http://www.example.com/schweiz-deutsch/',+ 'http://www.example.com/english/',+ ],+ }+ ]+ )def test_xml_entity_expansion(self):s = Sitemap(b"""<?xml version="1.0" encoding="utf-8"?>