diff --git a/scrapy/contrib/downloadermiddleware/cookies.py b/scrapy/contrib/downloadermiddleware/cookies.py index bfb1490fd..f87952f06 100644 --- a/scrapy/contrib/downloadermiddleware/cookies.py +++ b/scrapy/contrib/downloadermiddleware/cookies.py @@ -81,7 +81,7 @@ class CookiesMiddleware(object): else: cookie_list = request.cookies - cookies = map(self._format_cookie, cookie_list) + cookies = [self._format_cookie(x) for x in cookie_list] headers = {'Set-Cookie': cookies} response = Response(request.url, headers=headers) diff --git a/scrapy/contrib/httpcache.py b/scrapy/contrib/httpcache.py index d952f43e8..1dae5231e 100644 --- a/scrapy/contrib/httpcache.py +++ b/scrapy/contrib/httpcache.py @@ -15,7 +15,7 @@ class DummyPolicy(object): def __init__(self, settings): self.ignore_schemes = settings.getlist('HTTPCACHE_IGNORE_SCHEMES') - self.ignore_http_codes = map(int, settings.getlist('HTTPCACHE_IGNORE_HTTP_CODES')) + self.ignore_http_codes = [int(x) for x in settings.getlist('HTTPCACHE_IGNORE_HTTP_CODES')] def should_cache_request(self, request): return urlparse_cached(request).scheme not in self.ignore_schemes diff --git a/scrapy/telnet.py b/scrapy/telnet.py index 4fdd161d5..c233267c0 100644 --- a/scrapy/telnet.py +++ b/scrapy/telnet.py @@ -34,7 +34,7 @@ class TelnetConsole(protocol.ServerFactory): raise NotConfigured self.crawler = crawler self.noisy = False - self.portrange = map(int, crawler.settings.getlist('TELNETCONSOLE_PORT')) + self.portrange = [int(x) for x in crawler.settings.getlist('TELNETCONSOLE_PORT')] self.host = crawler.settings['TELNETCONSOLE_HOST'] self.crawler.signals.connect(self.start_listening, signals.engine_started) self.crawler.signals.connect(self.stop_listening, signals.engine_stopped) diff --git a/scrapy/tests/test_contracts.py b/scrapy/tests/test_contracts.py index 7e89de25f..a1a2ae454 100644 --- a/scrapy/tests/test_contracts.py +++ b/scrapy/tests/test_contracts.py @@ -91,7 +91,7 @@ class ContractsManagerTest(unittest.TestCase): # extract contracts correctly contracts = self.conman.extract_contracts(spider.returns_request) self.assertEqual(len(contracts), 2) - self.assertEqual(frozenset(map(type, contracts)), + self.assertEqual(frozenset(type(x) for x in contracts), frozenset([UrlContract, ReturnsContract])) # returns request for valid method @@ -109,13 +109,13 @@ class ContractsManagerTest(unittest.TestCase): # returns_item request = self.conman.from_method(spider.returns_item, self.results) output = request.callback(response) - self.assertEqual(map(type, output), [TestItem]) + self.assertEqual([type(x) for x in output], [TestItem]) self.should_succeed() # returns_request request = self.conman.from_method(spider.returns_request, self.results) output = request.callback(response) - self.assertEqual(map(type, output), [Request]) + self.assertEqual([type(x) for x in output], [Request]) self.should_succeed() # returns_fail @@ -130,7 +130,7 @@ class ContractsManagerTest(unittest.TestCase): # scrapes_item_ok request = self.conman.from_method(spider.scrapes_item_ok, self.results) output = request.callback(response) - self.assertEqual(map(type, output), [TestItem]) + self.assertEqual([type(x) for x in output], [TestItem]) self.should_succeed() # scrapes_item_fail diff --git a/scrapy/tests/test_dependencies.py b/scrapy/tests/test_dependencies.py index c45ef2e94..5bbb210bf 100644 --- a/scrapy/tests/test_dependencies.py +++ b/scrapy/tests/test_dependencies.py @@ -8,7 +8,7 @@ class ScrapyUtilsTest(unittest.TestCase): raise unittest.SkipTest("OpenSSL is not available") if hasattr(module, '__version__'): - installed_version = map(int, module.__version__.split('.')[:2]) + installed_version = [int(x) for x in module.__version__.split('.')[:2]] assert installed_version >= [0, 6], "OpenSSL >= 0.6 required" if __name__ == "__main__": diff --git a/scrapy/tests/test_pipeline_files.py b/scrapy/tests/test_pipeline_files.py index d9d20a658..130c2bcfe 100644 --- a/scrapy/tests/test_pipeline_files.py +++ b/scrapy/tests/test_pipeline_files.py @@ -63,12 +63,14 @@ class FilesPipelineTestCase(unittest.TestCase): mock.patch.object(FilesPipeline, 'get_media_requests', return_value=[_prepare_request_object(item_url)]) ] - map(lambda p: p.start(), patchers) + for p in patchers: + p.start() result = yield self.pipeline.process_item(item, None) self.assertEqual(result['files'][0]['checksum'], 'abc') - map(lambda p: p.stop(), patchers) + for p in patchers: + p.stop() @defer.inlineCallbacks def test_file_expired(self): @@ -82,12 +84,14 @@ class FilesPipelineTestCase(unittest.TestCase): return_value=[_prepare_request_object(item_url)]), mock.patch.object(FilesPipeline, 'inc_stats', return_value=True) ] - map(lambda p: p.start(), patchers) + for p in patchers: + p.start() result = yield self.pipeline.process_item(item, None) self.assertNotEqual(result['files'][0]['checksum'], 'abc') - map(lambda p: p.stop(), patchers) + for p in patchers: + p.stop() class FilesPipelineTestCaseFields(unittest.TestCase): diff --git a/scrapy/webservice.py b/scrapy/webservice.py index a694c5dda..d1ee2973e 100644 --- a/scrapy/webservice.py +++ b/scrapy/webservice.py @@ -69,7 +69,7 @@ class WebService(server.Site): raise NotConfigured self.crawler = crawler logfile = crawler.settings['WEBSERVICE_LOGFILE'] - self.portrange = map(int, crawler.settings.getlist('WEBSERVICE_PORT')) + self.portrange = [int(x) for x in crawler.settings.getlist('WEBSERVICE_PORT')] self.host = crawler.settings['WEBSERVICE_HOST'] root = RootResource(crawler) reslist = build_component_list(crawler.settings['WEBSERVICE_RESOURCES_BASE'], \