Scrapy, a fast high-level web crawling & scraping framework for Python.
replace set constructor with set literals (#4573)
Marc Hernándezfffb0a5b6a7e
diff --git a/tests/test_engine.py b/tests/test_engine.pyindex acfe94f63..d781665dc 100644--- a/tests/test_engine.py+++ b/tests/test_engine.py@@ -218,8 +218,8 @@ class EngineTest(unittest.TestCase):def _assert_visited_urls(self):must_be_visited = ["/", "/redirect", "/redirected","/item1.html", "/item2.html", "/item999.html"]- urls_visited = set([rp[0].url for rp in self.run.respplug])- urls_expected = set([self.run.geturl(p) for p in must_be_visited])+ urls_visited = {rp[0].url for rp in self.run.respplug}+ urls_expected = {self.run.geturl(p) for p in must_be_visited}assert urls_expected <= urls_visited, "URLs not visited: %s" % list(urls_expected - urls_visited)def _assert_scheduled_requests(self, urls_to_visit=None):@@ -227,8 +227,8 @@ class EngineTest(unittest.TestCase):paths_expected = ['/item999.html', '/item2.html', '/item1.html']- urls_requested = set([rq[0].url for rq in self.run.reqplug])- urls_expected = set([self.run.geturl(p) for p in paths_expected])+ urls_requested = {rq[0].url for rq in self.run.reqplug}+ urls_expected = {self.run.geturl(p) for p in paths_expected}assert urls_expected <= urls_requestedscheduled_requests_count = len(self.run.reqplug)dropped_requests_count = len(self.run.reqdropped)diff --git a/tests/test_http_request.py b/tests/test_http_request.pyindex a672963f3..349c23f36 100644--- a/tests/test_http_request.py+++ b/tests/test_http_request.py@@ -549,8 +549,8 @@ class FormRequestTest(RequestTest):self.assertEqual(urlparse(r1.url).hostname, "www.example.com")self.assertEqual(urlparse(r1.url).path, "/this/get.php")fs = _qs(r1)- self.assertEqual(set(fs[b'test']), set([b'val1', b'val2']))- self.assertEqual(set(fs[b'one']), set([b'two', b'three']))+ self.assertEqual(set(fs[b'test']), {b'val1', b'val2'})+ self.assertEqual(set(fs[b'one']), {b'two', b'three'})self.assertEqual(fs[b'test2'], [b'xxx'])self.assertEqual(fs[b'six'], [b'seven'])@@ -1047,7 +1047,7 @@ class FormRequestTest(RequestTest):</form>''')req = self.request_class.from_response(res)fs = _qs(req)- self.assertEqual(set(fs), set([b'h2', b'i2', b'i1', b'i3', b'h1', b'i5', b'i4']))+ self.assertEqual(set(fs), {b'h2', b'i2', b'i1', b'i3', b'h1', b'i5', b'i4'})def test_from_response_xpath(self):response = _buildresponse(diff --git a/tests/test_pipeline_crawl.py b/tests/test_pipeline_crawl.pyindex 6d15aaf31..74263e50c 100644--- a/tests/test_pipeline_crawl.py+++ b/tests/test_pipeline_crawl.py@@ -51,10 +51,10 @@ class FileDownloadCrawlTestCase(TestCase):store_setting_key = 'FILES_STORE'media_key = 'files'media_urls_key = 'file_urls'- expected_checksums = set([+ expected_checksums = {'5547178b89448faf0015a13f904c936e','c2281c83670e31d8aaab7cb642b824db',- 'ed3f6538dc15d4d9179dae57319edc5f'])+ 'ed3f6538dc15d4d9179dae57319edc5f'}def setUp(self):self.mockserver = MockServer()diff --git a/tests/test_pipeline_images.py b/tests/test_pipeline_images.pyindex 5ba03ff4c..76aea470f 100644--- a/tests/test_pipeline_images.py+++ b/tests/test_pipeline_images.py@@ -18,7 +18,7 @@ try:except ImportError:skip = 'Missing Python Imaging Library, install https://pypi.python.org/pypi/Pillow'else:- encoders = set(('jpeg_encoder', 'jpeg_decoder'))+ encoders = {'jpeg_encoder', 'jpeg_decoder'}if not encoders.issubset(set(Image.core.__dict__)):skip = 'Missing JPEG encoders'diff --git a/tests/test_spiderloader/__init__.py b/tests/test_spiderloader/__init__.pyindex 265970b43..d922c6059 100644--- a/tests/test_spiderloader/__init__.py+++ b/tests/test_spiderloader/__init__.py@@ -42,7 +42,7 @@ class SpiderLoaderTest(unittest.TestCase):def test_list(self):self.assertEqual(set(self.spider_loader.list()),- set(['spider1', 'spider2', 'spider3', 'spider4']))+ {'spider1', 'spider2', 'spider3', 'spider4'})def test_load(self):spider1 = self.spider_loader.load("spider1")@@ -57,7 +57,7 @@ class SpiderLoaderTest(unittest.TestCase):['spider2'])self.assertEqual(set(self.spider_loader.find_by_request(Request('http://scrapy3.org/test'))),- set(['spider1', 'spider2']))+ {'spider1', 'spider2'})self.assertEqual(self.spider_loader.find_by_request(Request('http://scrapy999.org/test')),[])@@ -151,7 +151,7 @@ class DuplicateSpiderNameLoaderTest(unittest.TestCase):self.assertNotIn("'spider4'", msg)spiders = set(spider_loader.list())- self.assertEqual(spiders, set(['spider1', 'spider2', 'spider3', 'spider4']))+ self.assertEqual(spiders, {'spider1', 'spider2', 'spider3', 'spider4'})def test_multiple_dupename_warning(self):# copy 2 spider modules so as to have duplicate spider name@@ -177,4 +177,4 @@ class DuplicateSpiderNameLoaderTest(unittest.TestCase):self.assertNotIn("'spider4'", msg)spiders = set(spider_loader.list())- self.assertEqual(spiders, set(['spider1', 'spider2', 'spider3', 'spider4']))+ self.assertEqual(spiders, {'spider1', 'spider2', 'spider3', 'spider4'})diff --git a/tests/test_utils_datatypes.py b/tests/test_utils_datatypes.pyindex e5aa56eb9..0a4c6034a 100644--- a/tests/test_utils_datatypes.py+++ b/tests/test_utils_datatypes.py@@ -217,7 +217,7 @@ class SequenceExcludeTest(unittest.TestCase):def test_set(self):"""Anything that is not in the supplied sequence will evaluate as 'in' the container."""- seq = set([-3, "test", 1.1])+ seq = {-3, "test", 1.1}d = SequenceExclude(seq)self.assertIn(0, d)self.assertIn("foo", d)diff --git a/tests/test_utils_misc/__init__.py b/tests/test_utils_misc/__init__.pyindex 28205e0d9..9bb996d27 100644--- a/tests/test_utils_misc/__init__.py+++ b/tests/test_utils_misc/__init__.py@@ -26,20 +26,20 @@ class UtilsMiscTestCase(unittest.TestCase):'tests.test_utils_misc.test_walk_modules.mod.mod0','tests.test_utils_misc.test_walk_modules.mod1',]- self.assertEqual(set([m.__name__ for m in mods]), set(expected))+ self.assertEqual({m.__name__ for m in mods}, set(expected))mods = walk_modules('tests.test_utils_misc.test_walk_modules.mod')expected = ['tests.test_utils_misc.test_walk_modules.mod','tests.test_utils_misc.test_walk_modules.mod.mod0',]- self.assertEqual(set([m.__name__ for m in mods]), set(expected))+ self.assertEqual({m.__name__ for m in mods}, set(expected))mods = walk_modules('tests.test_utils_misc.test_walk_modules.mod1')expected = ['tests.test_utils_misc.test_walk_modules.mod1',]- self.assertEqual(set([m.__name__ for m in mods]), set(expected))+ self.assertEqual({m.__name__ for m in mods}, set(expected))self.assertRaises(ImportError, walk_modules, 'nomodule999')@@ -54,7 +54,7 @@ class UtilsMiscTestCase(unittest.TestCase):'testegg.spiders.b','testegg']- self.assertEqual(set([m.__name__ for m in mods]), set(expected))+ self.assertEqual({m.__name__ for m in mods}, set(expected))finally:sys.path.remove(egg)diff --git a/tests/test_utils_url.py b/tests/test_utils_url.pyindex 16e7449c9..4ab944949 100644--- a/tests/test_utils_url.py+++ b/tests/test_utils_url.py@@ -55,7 +55,7 @@ class UrlUtilsTest(unittest.TestCase):self.assertTrue(url_is_from_spider('http://www.example.net/some/page.html', spider))self.assertFalse(url_is_from_spider('http://www.example.us/some/page.html', spider))- spider = Spider(name='example.com', allowed_domains=set(('example.com', 'example.net')))+ spider = Spider(name='example.com', allowed_domains={'example.com', 'example.net'})self.assertTrue(url_is_from_spider('http://www.example.com/some/page.html', spider))spider = Spider(name='example.com', allowed_domains=('example.com', 'example.net'))