Scrapy, a fast high-level web crawling & scraping framework for Python.
Flake8: remove F841
Eugenio Lacuesta6f8758624c8d
diff --git a/pytest.ini b/pytest.iniindex 32fd76445..fee54dcbd 100644--- a/pytest.ini+++ b/pytest.ini@@ -164,14 +164,13 @@ flake8-ignore =scrapy/robotstxt.py E501scrapy/shell.py E501scrapy/signalmanager.py E501- scrapy/spiderloader.py F841 E501+ scrapy/spiderloader.py E501scrapy/squeues.py E128scrapy/squeues.py E501scrapy/statscollectors.py E501# teststests/__init__.py E402 E501tests/mockserver.py E501- tests/pipelines.py F841tests/spiders.py E501tests/test_closespider.py E501tests/test_command_fetch.py E501@@ -180,8 +179,8 @@ flake8-ignore =tests/test_commands.py E128 E501tests/test_contracts.py E501 E128tests/test_crawl.py E501 E741- tests/test_crawler.py F841 E501- tests/test_dependencies.py F841 E501+ tests/test_crawler.py E501+ tests/test_dependencies.py E501tests/test_downloader_handlers.py E128 E501tests/test_downloadermiddleware.py E501tests/test_downloadermiddleware_ajaxcrawlable.py E501@@ -199,13 +198,12 @@ flake8-ignore =tests/test_dupefilters.py E501 E741 E128tests/test_engine.py E501 E128tests/test_exporters.py E501 E128- tests/test_extension_telnet.py F841- tests/test_feedexport.py E501 F841+ tests/test_feedexport.py E501tests/test_http_cookies.py E501tests/test_http_headers.py E501tests/test_http_request.py E402 E501 E128 E128tests/test_http_response.py E501 E128- tests/test_item.py E128 F841+ tests/test_item.py E128tests/test_link.py E501tests/test_linkextractors.py E501 E128tests/test_loader.py E501 E741 E128@@ -214,7 +212,7 @@ flake8-ignore =tests/test_middleware.py E501 E128tests/test_pipeline_crawl.py E501 E128tests/test_pipeline_files.py E501- tests/test_pipeline_images.py F841 E501+ tests/test_pipeline_images.py E501tests/test_pipeline_media.py E501 E741 E128tests/test_proxy_connect.py E501 E741tests/test_request_cb_kwargs.py E501@@ -227,14 +225,14 @@ flake8-ignore =tests/test_spidermiddleware_httperror.py E128 E501tests/test_spidermiddleware_offsite.py E501 E128tests/test_spidermiddleware_output_chain.py E501- tests/test_spidermiddleware_referer.py E501 F841 E501+ tests/test_spidermiddleware_referer.py E501 E501tests/test_squeues.py E501 E741tests/test_utils_asyncio.py E501tests/test_utils_conf.py E501 E128tests/test_utils_curl.py E501tests/test_utils_datatypes.py E402 E501- tests/test_utils_defer.py E501 F841- tests/test_utils_deprecate.py F841 E501+ tests/test_utils_defer.py E501+ tests/test_utils_deprecate.py E501tests/test_utils_http.py E501 E128tests/test_utils_iterators.py E501 E128tests/test_utils_log.py E741@@ -242,7 +240,7 @@ flake8-ignore =tests/test_utils_reqser.py E501 E128tests/test_utils_request.py E501 E128tests/test_utils_response.py E501- tests/test_utils_signal.py E741 F841+ tests/test_utils_signal.py E741tests/test_utils_sitemap.py E128 E501tests/test_utils_url.py E501 E501tests/test_webclient.py E501 E128 E402diff --git a/tests/pipelines.py b/tests/pipelines.pyindex cf677cc17..fed2af7d3 100644--- a/tests/pipelines.py+++ b/tests/pipelines.py@@ -6,7 +6,7 @@ Some pipelines used for testingclass ZeroDivisionErrorPipeline:def open_spider(self, spider):- a = 1 / 0+ 1 / 0def process_item(self, item, spider):return itemdiff --git a/tests/test_crawler.py b/tests/test_crawler.pyindex 9151278a5..ecc0cd7af 100644--- a/tests/test_crawler.py+++ b/tests/test_crawler.py@@ -87,7 +87,7 @@ class CrawlerLoggingTestCase(unittest.TestCase):class MySpider(scrapy.Spider):name = 'spider'- crawler = Crawler(MySpider, {})+ Crawler(MySpider, {})assert get_scrapy_root_handler() is Nonedef test_spider_custom_settings_log_level(self):@@ -240,13 +240,13 @@ class CrawlerRunnerHasSpider(unittest.TestCase):def test_crawler_runner_asyncio_enabled_true(self):if self.reactor_pytest == 'asyncio':- runner = CrawlerRunner(settings={+ CrawlerRunner(settings={"TWISTED_REACTOR": "twisted.internet.asyncioreactor.AsyncioSelectorReactor",})else:msg = r"The installed reactor \(.*?\) does not match the requested one \(.*?\)"with self.assertRaisesRegex(Exception, msg):- runner = CrawlerRunner(settings={+ CrawlerRunner(settings={"TWISTED_REACTOR": "twisted.internet.asyncioreactor.AsyncioSelectorReactor",})diff --git a/tests/test_dependencies.py b/tests/test_dependencies.pyindex a169acbe6..5d0a1d0c9 100644--- a/tests/test_dependencies.py+++ b/tests/test_dependencies.py@@ -6,7 +6,7 @@ class ScrapyUtilsTest(unittest.TestCase):def test_required_openssl_version(self):try:module = import_module('OpenSSL')- except ImportError as ex:+ except ImportError:raise unittest.SkipTest("OpenSSL is not available")if hasattr(module, '__version__'):diff --git a/tests/test_extension_telnet.py b/tests/test_extension_telnet.pyindex 873a97248..1e716b94a 100644--- a/tests/test_extension_telnet.py+++ b/tests/test_extension_telnet.py@@ -11,8 +11,6 @@ class TelnetExtensionTest(unittest.TestCase):def _get_console_and_portal(self, settings=None):crawler = get_crawler(settings_dict=settings)console = TelnetConsole(crawler)- username = console.username- password = console.password# This function has some side effects we don't need for this testconsole._get_telnet_vars = lambda: {}diff --git a/tests/test_feedexport.py b/tests/test_feedexport.pyindex e02b0b840..cbc81bc35 100644--- a/tests/test_feedexport.py+++ b/tests/test_feedexport.py@@ -715,7 +715,6 @@ class FeedExportTest(unittest.TestCase):@defer.inlineCallbacksdef test_export_encoding(self):items = [dict({'foo': u'Test\xd6'})]- header = ['foo']formats = {'json': u'[{"foo": "Test\\u00d6"}]'.encode('utf-8'),diff --git a/tests/test_item.py b/tests/test_item.pyindex 4017f6e84..58735cc5c 100644--- a/tests/test_item.py+++ b/tests/test_item.py@@ -264,12 +264,12 @@ class ItemTest(unittest.TestCase):"""Make sure the DictItem deprecation warning is not issued forItem"""with catch_warnings(record=True) as warnings:- item = Item()+ Item()self.assertEqual(len(warnings), 0)class SubclassedItem(Item):pass- subclassed_item = SubclassedItem()+ SubclassedItem()self.assertEqual(len(warnings), 0)@@ -321,13 +321,13 @@ class DictItemTest(unittest.TestCase):def test_deprecation_warning(self):with catch_warnings(record=True) as warnings:- dict_item = DictItem()+ DictItem()self.assertEqual(len(warnings), 1)self.assertEqual(warnings[0].category, ScrapyDeprecationWarning)with catch_warnings(record=True) as warnings:class SubclassedDictItem(DictItem):pass- subclassed_dict_item = SubclassedDictItem()+ SubclassedDictItem()self.assertEqual(len(warnings), 1)self.assertEqual(warnings[0].category, ScrapyDeprecationWarning)diff --git a/tests/test_pipeline_images.py b/tests/test_pipeline_images.pyindex 5018d6802..5ba03ff4c 100644--- a/tests/test_pipeline_images.py+++ b/tests/test_pipeline_images.py@@ -15,7 +15,7 @@ from scrapy.utils.python import to_bytesskip = Falsetry:from PIL import Image-except ImportError as e:+except ImportError:skip = 'Missing Python Imaging Library, install https://pypi.python.org/pypi/Pillow'else:encoders = set(('jpeg_encoder', 'jpeg_decoder'))diff --git a/tests/test_spidermiddleware_referer.py b/tests/test_spidermiddleware_referer.pyindex 41589177a..ca765518b 100644--- a/tests/test_spidermiddleware_referer.py+++ b/tests/test_spidermiddleware_referer.py@@ -459,7 +459,6 @@ class TestRequestMetaSettingFallback(TestCase):target = 'http://www.example.com'for settings, response_headers, request_meta, policy_class, check_warning in self.params[3:]:- spider = Spider('foo')mw = RefererMiddleware(Settings(settings))response = Response(origin, headers=response_headers)@@ -511,7 +510,7 @@ class TestSettingsPolicyByName(TestCase):def test_invalid_name(self):settings = Settings({'REFERRER_POLICY': 'some-custom-unknown-policy'})with self.assertRaises(RuntimeError):- mw = RefererMiddleware(settings)+ RefererMiddleware(settings)class TestPolicyHeaderPredecence001(MixinUnsafeUrl, TestRefererMiddleware):diff --git a/tests/test_utils_defer.py b/tests/test_utils_defer.pyindex a3b6e64f1..2d4b88121 100644--- a/tests/test_utils_defer.py+++ b/tests/test_utils_defer.py@@ -64,7 +64,7 @@ class DeferUtilsTest(unittest.TestCase):gotexc = Falsetry:yield process_chain([cb1, cb_fail, cb3], 'res', 'v1', 'v2')- except TypeError as e:+ except TypeError:gotexc = Trueself.assertTrue(gotexc)@@ -104,7 +104,7 @@ class IterErrbackTest(unittest.TestCase):def iterbad():for x in range(10):if x == 5:- a = 1 / 0+ 1 / 0yield xerrors = []diff --git a/tests/test_utils_deprecate.py b/tests/test_utils_deprecate.pyindex adef66c1d..35d35b45d 100644--- a/tests/test_utils_deprecate.py+++ b/tests/test_utils_deprecate.py@@ -25,7 +25,7 @@ class WarnWhenSubclassedTest(unittest.TestCase):def test_no_warning_on_definition(self):with warnings.catch_warnings(record=True) as w:- Deprecated = create_deprecated_class('Deprecated', NewName)+ create_deprecated_class('Deprecated', NewName)w = self._mywarnings(w)self.assertEqual(w, [])@@ -217,7 +217,7 @@ class WarnWhenSubclassedTest(unittest.TestCase):def test_deprecate_a_class_with_custom_metaclass(self):Meta1 = type('Meta1', (type,), {})New = Meta1('New', (), {})- Deprecated = create_deprecated_class('Deprecated', New)+ create_deprecated_class('Deprecated', New)def test_deprecate_subclass_of_deprecated_class(self):with warnings.catch_warnings(record=True) as w:diff --git a/tests/test_utils_signal.py b/tests/test_utils_signal.pyindex bb211dc60..c83c9398c 100644--- a/tests/test_utils_signal.py+++ b/tests/test_utils_signal.py@@ -44,7 +44,7 @@ class SendCatchLogTest(unittest.TestCase):def error_handler(self, arg, handlers_called):handlers_called.add(self.error_handler)- a = 1 / 0+ 1 / 0def ok_handler(self, arg, handlers_called):handlers_called.add(self.ok_handler)