Scrapy, a fast high-level web crawling & scraping framework for Python.
Fix E502: backslash is redundant between brackets (#4238)
Marc Hernández63cf5c75c850
diff --git a/pytest.ini b/pytest.iniindex 1b23595c0..f088e10ef 100644--- a/pytest.ini+++ b/pytest.ini@@ -33,45 +33,45 @@ flake8-ignore =scrapy/commands/check.py E501scrapy/commands/crawl.py E501scrapy/commands/edit.py E501- scrapy/commands/fetch.py E401 E501 E128 E502 E731+ scrapy/commands/fetch.py E401 E501 E128 E731scrapy/commands/genspider.py E128 E501 E502scrapy/commands/parse.py E128 E501 E731 E226scrapy/commands/runspider.py E501scrapy/commands/settings.py E128scrapy/commands/shell.py E128 E501 E502- scrapy/commands/startproject.py E502 E127 E501 E128+ scrapy/commands/startproject.py E127 E501 E128scrapy/commands/version.py E501 E128# scrapy/contractsscrapy/contracts/__init__.py E501 W504- scrapy/contracts/default.py E502 E128+ scrapy/contracts/default.py E128# scrapy/corescrapy/core/engine.py E501 E128 E127 E306 E502scrapy/core/scheduler.py E501scrapy/core/scraper.py E501 E306 E128 W504- scrapy/core/spidermw.py E501 E731 E502 E126 E226+ scrapy/core/spidermw.py E501 E731 E126 E226scrapy/core/downloader/__init__.py E501scrapy/core/downloader/contextfactory.py E501 E128 E126scrapy/core/downloader/middleware.py E501 E502scrapy/core/downloader/tls.py E501 E305 E241- scrapy/core/downloader/webclient.py E731 E501 E502 E128 E126 E226+ scrapy/core/downloader/webclient.py E731 E501 E128 E126 E226scrapy/core/downloader/handlers/__init__.py E501scrapy/core/downloader/handlers/ftp.py E501 E305 E128 E127scrapy/core/downloader/handlers/http10.py E501scrapy/core/downloader/handlers/http11.py E501- scrapy/core/downloader/handlers/s3.py E501 E502 E128 E126+ scrapy/core/downloader/handlers/s3.py E501 E128 E126# scrapy/downloadermiddlewaresscrapy/downloadermiddlewares/ajaxcrawl.py E501 E226scrapy/downloadermiddlewares/decompression.py E501scrapy/downloadermiddlewares/defaultheaders.py E501scrapy/downloadermiddlewares/httpcache.py E501 E126- scrapy/downloadermiddlewares/httpcompression.py E502 E128+ scrapy/downloadermiddlewares/httpcompression.py E501 E128scrapy/downloadermiddlewares/httpproxy.py E501scrapy/downloadermiddlewares/redirect.py E501 W504scrapy/downloadermiddlewares/retry.py E501 E126scrapy/downloadermiddlewares/robotstxt.py E501scrapy/downloadermiddlewares/stats.py E501# scrapy/extensions- scrapy/extensions/closespider.py E501 E502 E128 E123+ scrapy/extensions/closespider.py E501 E128 E123scrapy/extensions/corestats.py E501scrapy/extensions/feedexport.py E128 E501scrapy/extensions/httpcache.py E128 E501 E303@@ -88,10 +88,10 @@ flake8-ignore =scrapy/http/response/__init__.py E501 E128 W293 W291scrapy/http/response/text.py E501 W293 E128 E124# scrapy/linkextractors- scrapy/linkextractors/__init__.py E731 E502 E501 E402+ scrapy/linkextractors/__init__.py E731 E501 E402scrapy/linkextractors/lxmlhtml.py E501 E731 E226# scrapy/loader- scrapy/loader/__init__.py E501 E502 E128+ scrapy/loader/__init__.py E501 E128scrapy/loader/processors.py E501# scrapy/pipelinesscrapy/pipelines/files.py E116 E501 E266@@ -116,7 +116,7 @@ flake8-ignore =scrapy/spiders/sitemap.py E501# scrapy/utilsscrapy/utils/benchserver.py E501- scrapy/utils/conf.py E402 E502 E501+ scrapy/utils/conf.py E402 E501scrapy/utils/console.py E306 E305scrapy/utils/datatypes.py E501 E226scrapy/utils/decorators.py E501@@ -145,7 +145,7 @@ flake8-ignore =# scrapyscrapy/__init__.py E402 E501scrapy/_monkeypatches.py W293- scrapy/cmdline.py E502 E501+ scrapy/cmdline.py E501scrapy/crawler.py E501scrapy/dupefilters.py E501 E202scrapy/exceptions.py E501@@ -155,7 +155,7 @@ flake8-ignore =scrapy/link.py E501scrapy/logformatter.py E501 W293scrapy/mail.py E402 E128 E501 E502- scrapy/middleware.py E502 E128 E501+ scrapy/middleware.py E128 E501scrapy/pqueues.py E501scrapy/responsetypes.py E128 E501 E305scrapy/robotstxt.py E501@@ -178,7 +178,7 @@ flake8-ignore =tests/test_crawl.py E501 E741 E265tests/test_crawler.py F841 E306 E501tests/test_dependencies.py F841 E501 E305- tests/test_downloader_handlers.py E124 E127 E128 E225 E265 E501 E502 E701 E126 E226 E123+ tests/test_downloader_handlers.py E124 E127 E128 E225 E265 E501 E701 E126 E226 E123tests/test_downloadermiddleware.py E501tests/test_downloadermiddleware_ajaxcrawlable.py E501tests/test_downloadermiddleware_cookies.py E731 E741 E501 E128 E303 E265 E126@@ -189,18 +189,18 @@ flake8-ignore =tests/test_downloadermiddleware_httpcompression.py E501 E251 E126 E123tests/test_downloadermiddleware_httpproxy.py E501 E128tests/test_downloadermiddleware_redirect.py E501 E303 E128 E306 E127 E305- tests/test_downloadermiddleware_retry.py E501 E128 W293 E251 E502 E303 E126+ tests/test_downloadermiddleware_retry.py E501 E128 W293 E251 E303 E126tests/test_downloadermiddleware_robotstxt.py E501tests/test_downloadermiddleware_stats.py E501tests/test_dupefilters.py E221 E501 E741 W293 W291 E128 E124- tests/test_engine.py E401 E501 E502 E128+ tests/test_engine.py E401 E501 E128tests/test_exporters.py E501 E731 E306 E128 E124tests/test_extension_telnet.py F841tests/test_feedexport.py E501 F841 E241tests/test_http_cookies.py E501tests/test_http_headers.py E501- tests/test_http_request.py E402 E501 E127 E128 W293 E502 E128 E502 E126 E123- tests/test_http_response.py E501 E301 E502 E128 E265+ tests/test_http_request.py E402 E501 E127 E128 W293 E128 E126 E123+ tests/test_http_response.py E501 E301 E128 E265tests/test_item.py E701 E128 F841 E306tests/test_link.py E501tests/test_linkextractors.py E501 E128 E124@@ -230,7 +230,7 @@ flake8-ignore =tests/test_utils_datatypes.py E402 E501 E305tests/test_utils_defer.py E306 E501 F841 E226tests/test_utils_deprecate.py F841 E306 E501- tests/test_utils_http.py E501 E502 E128 W504+ tests/test_utils_http.py E501 E128 W504tests/test_utils_iterators.py E501 E128 E129 E303 E241tests/test_utils_log.py E741 E226tests/test_utils_python.py E501 E303 E731 E701 E305@@ -243,7 +243,7 @@ flake8-ignore =tests/test_utils_template.py E305tests/test_utils_url.py E501 E127 E305 E211 E125 E501 E226 E241 E126 E123tests/test_webclient.py E501 E128 E122 E303 E402 E306 E226 E241 E123 E126- tests/test_cmdline/__init__.py E502 E501+ tests/test_cmdline/__init__.py E501tests/test_settings/__init__.py E501 E128tests/test_spiderloader/__init__.py E128 E501tests/test_utils_misc/__init__.py E501diff --git a/scrapy/cmdline.py b/scrapy/cmdline.pyindex 69e917004..ec78f7c91 100644--- a/scrapy/cmdline.py+++ b/scrapy/cmdline.py@@ -67,7 +67,7 @@ def _pop_command_name(argv):def _print_header(settings, inproject):if inproject:- print("Scrapy %s - project: %s\n" % (scrapy.__version__, \+ print("Scrapy %s - project: %s\n" % (scrapy.__version__,settings['BOT_NAME']))else:print("Scrapy %s - no active project\n" % scrapy.__version__)@@ -123,7 +123,7 @@ def execute(argv=None, settings=None):inproject = inside_project()cmds = _get_commands_dict(settings, inproject)cmdname = _pop_command_name(argv)- parser = optparse.OptionParser(formatter=optparse.TitledHelpFormatter(), \+ parser = optparse.OptionParser(formatter=optparse.TitledHelpFormatter(),conflict_handler='resolve')if not cmdname:_print_commands(settings, inproject)diff --git a/scrapy/commands/fetch.py b/scrapy/commands/fetch.pyindex 8a22ebabe..0e149941d 100644--- a/scrapy/commands/fetch.py+++ b/scrapy/commands/fetch.py@@ -24,12 +24,11 @@ class Command(ScrapyCommand):def add_options(self, parser):ScrapyCommand.add_options(self, parser)- parser.add_option("--spider", dest="spider",- help="use this spider")- parser.add_option("--headers", dest="headers", action="store_true", \- help="print response HTTP headers instead of body")- parser.add_option("--no-redirect", dest="no_redirect", action="store_true", \- default=False, help="do not handle HTTP 3xx status codes and print response as-is")+ parser.add_option("--spider", dest="spider", help="use this spider")+ parser.add_option("--headers", dest="headers", action="store_true",+ help="print response HTTP headers instead of body")+ parser.add_option("--no-redirect", dest="no_redirect", action="store_true",+ default=False, help="do not handle HTTP 3xx status codes and print response as-is")def _print_headers(self, headers, prefix):for key, values in headers.items():diff --git a/scrapy/commands/startproject.py b/scrapy/commands/startproject.pyindex e65131ae8..b123e5c84 100644--- a/scrapy/commands/startproject.py+++ b/scrapy/commands/startproject.py@@ -43,8 +43,8 @@ class Command(ScrapyCommand):return Falseif not re.search(r'^[_a-zA-Z]\w*$', project_name):- print('Error: Project names must begin with a letter and contain'\- ' only\nletters, numbers and underscores')+ print('Error: Project names must begin with a letter and contain'+ ' only\nletters, numbers and underscores')elif _module_exists(project_name):print('Error: Module %r already exists' % project_name)else:diff --git a/scrapy/contracts/default.py b/scrapy/contracts/default.pyindex e0d425874..3002fc702 100644--- a/scrapy/contracts/default.py+++ b/scrapy/contracts/default.py@@ -86,8 +86,8 @@ class ReturnsContract(Contract):else:expected = '%s..%s' % (self.min_bound, self.max_bound)- raise ContractFail("Returned %s %s, expected %s" % \- (occurrences, self.obj_name, expected))+ raise ContractFail("Returned %s %s, expected %s" %+ (occurrences, self.obj_name, expected))class ScrapesContract(Contract):diff --git a/scrapy/core/downloader/handlers/s3.py b/scrapy/core/downloader/handlers/s3.pyindex e2a07bdef..d6fbd54ee 100644--- a/scrapy/core/downloader/handlers/s3.py+++ b/scrapy/core/downloader/handlers/s3.py@@ -32,8 +32,8 @@ def _get_boto_connection():class S3DownloadHandler(object):- def __init__(self, settings, aws_access_key_id=None, aws_secret_access_key=None, \- httpdownloadhandler=HTTPDownloadHandler, **kw):+ def __init__(self, settings, aws_access_key_id=None, aws_secret_access_key=None,+ httpdownloadhandler=HTTPDownloadHandler, **kw):if not aws_access_key_id:aws_access_key_id = settings['AWS_ACCESS_KEY_ID']diff --git a/scrapy/core/downloader/webclient.py b/scrapy/core/downloader/webclient.pyindex f368c3bae..fc796e8bb 100644--- a/scrapy/core/downloader/webclient.py+++ b/scrapy/core/downloader/webclient.py@@ -88,9 +88,9 @@ class ScrapyHTTPPageGetter(HTTPClient):if self.factory.url.startswith(b'https'):self.transport.stopProducing()- self.factory.noPage(\- defer.TimeoutError("Getting %s took longer than %s seconds." % \- (self.factory.url, self.factory.timeout)))+ self.factory.noPage(+ defer.TimeoutError("Getting %s took longer than %s seconds." %+ (self.factory.url, self.factory.timeout)))class ScrapyHTTPClientFactory(HTTPClientFactory):diff --git a/scrapy/core/spidermw.py b/scrapy/core/spidermw.pyindex e2ade8256..097a374bf 100644--- a/scrapy/core/spidermw.py+++ b/scrapy/core/spidermw.py@@ -44,7 +44,7 @@ class SpiderMiddlewareManager(MiddlewareManager):try:result = method(response=response, spider=spider)if result is not None:- raise _InvalidOutput('Middleware {} must return None or raise an exception, got {}' \+ raise _InvalidOutput('Middleware {} must return None or raise an exception, got {}'.format(fname(method), type(result)))except _InvalidOutput:raise@@ -69,7 +69,7 @@ class SpiderMiddlewareManager(MiddlewareManager):elif result is None:continueelse:- raise _InvalidOutput('Middleware {} must return None or an iterable, got {}' \+ raise _InvalidOutput('Middleware {} must return None or an iterable, got {}'.format(fname(method), type(result)))return _failure@@ -103,7 +103,7 @@ class SpiderMiddlewareManager(MiddlewareManager):if _isiterable(result):result = evaluate_iterable(result, method_index)else:- raise _InvalidOutput('Middleware {} must return an iterable, got {}' \+ raise _InvalidOutput('Middleware {} must return an iterable, got {}'.format(fname(method), type(result)))return chain(result, recovered)diff --git a/scrapy/downloadermiddlewares/httpcompression.py b/scrapy/downloadermiddlewares/httpcompression.pyindex 203dee42d..65b652953 100644--- a/scrapy/downloadermiddlewares/httpcompression.py+++ b/scrapy/downloadermiddlewares/httpcompression.py@@ -37,8 +37,9 @@ class HttpCompressionMiddleware(object):if content_encoding:encoding = content_encoding.pop()decoded_body = self._decode(response.body, encoding.lower())- respcls = responsetypes.from_args(headers=response.headers, \- url=response.url, body=decoded_body)+ respcls = responsetypes.from_args(+ headers=response.headers, url=response.url, body=decoded_body+ )kwargs = dict(cls=respcls, body=decoded_body)if issubclass(respcls, TextResponse):# force recalculating the encoding until we make sure thediff --git a/scrapy/extensions/closespider.py b/scrapy/extensions/closespider.pyindex 9ccf356ec..afb2ed049 100644--- a/scrapy/extensions/closespider.py+++ b/scrapy/extensions/closespider.py@@ -54,9 +54,9 @@ class CloseSpider(object):self.crawler.engine.close_spider(spider, 'closespider_pagecount')def spider_opened(self, spider):- self.task = reactor.callLater(self.close_on['timeout'], \- self.crawler.engine.close_spider, spider, \- reason='closespider_timeout')+ self.task = reactor.callLater(self.close_on['timeout'],+ self.crawler.engine.close_spider, spider,+ reason='closespider_timeout')def item_scraped(self, item, spider):self.counter['itemcount'] += 1diff --git a/scrapy/linkextractors/__init__.py b/scrapy/linkextractors/__init__.pyindex 4a3e74fbe..bc65f41cc 100644--- a/scrapy/linkextractors/__init__.py+++ b/scrapy/linkextractors/__init__.py@@ -44,8 +44,7 @@ IGNORED_EXTENSIONS = [_re_type = type(re.compile("", 0))_matches = lambda url, regexs: any(r.search(url) for r in regexs)-_is_valid_url = lambda url: url.split('://', 1)[0] in {'http', 'https', \- 'file', 'ftp'}+_is_valid_url = lambda url: url.split('://', 1)[0] in {'http', 'https', 'file', 'ftp'}class FilteringLinkExtractor(object):diff --git a/scrapy/middleware.py b/scrapy/middleware.pyindex 1cfd8a782..53fa435bb 100644--- a/scrapy/middleware.py+++ b/scrapy/middleware.py@@ -65,8 +65,8 @@ class MiddlewareManager(object):return process_chain(self.methods[methodname], obj, *args)def _process_chain_both(self, cb_methodname, eb_methodname, obj, *args):- return process_chain_both(self.methods[cb_methodname], \- self.methods[eb_methodname], obj, *args)+ return process_chain_both(self.methods[cb_methodname],+ self.methods[eb_methodname], obj, *args)def open_spider(self, spider):return self._process_parallel('open_spider', spider)diff --git a/scrapy/utils/conf.py b/scrapy/utils/conf.pyindex 7a15e77ff..23306ca28 100644--- a/scrapy/utils/conf.py+++ b/scrapy/utils/conf.py@@ -37,7 +37,7 @@ def build_component_list(compdict, custom=None, convert=update_classpath):"""Fail if a value in the components dict is not a real number or None."""for name, value in compdict.items():if value is not None and not isinstance(value, numbers.Real):- raise ValueError('Invalid value {} for component {}, please provide ' \+ raise ValueError('Invalid value {} for component {}, please provide ''a real number or None instead'.format(value, name))# BEGIN Backward compatibility for old (base, custom) call signaturediff --git a/tests/test_cmdline/__init__.py b/tests/test_cmdline/__init__.pyindex 909ea90e0..da99a6be8 100644--- a/tests/test_cmdline/__init__.py+++ b/tests/test_cmdline/__init__.py@@ -25,17 +25,15 @@ class CmdlineTest(unittest.TestCase):return comm.decode(encoding)def test_default_settings(self):- self.assertEqual(self._execute('settings', '--get', 'TEST1'), \- 'default')+ self.assertEqual(self._execute('settings', '--get', 'TEST1'), 'default')def test_override_settings_using_set_arg(self):- self.assertEqual(self._execute('settings', '--get', 'TEST1', '-s', 'TEST1=override'), \- 'override')+ self.assertEqual(self._execute('settings', '--get', 'TEST1', '-s',+ 'TEST1=override'), 'override')def test_override_settings_using_envvar(self):self.env['SCRAPY_TEST1'] = 'override'- self.assertEqual(self._execute('settings', '--get', 'TEST1'), \- 'override')+ self.assertEqual(self._execute('settings', '--get', 'TEST1'), 'override')def test_profiling(self):path = tempfile.mkdtemp()diff --git a/tests/test_downloader_handlers.py b/tests/test_downloader_handlers.pyindex 2db2417e8..82d7b18d6 100644--- a/tests/test_downloader_handlers.py+++ b/tests/test_downloader_handlers.py@@ -800,8 +800,8 @@ class S3TestCase(unittest.TestCase):req = Request('s3://johnsmith/photos/puppy.jpg', headers={'Date': date})with self._mocked_date(date):httpreq = self.download_request(req, self.spider)- self.assertEqual(httpreq.headers['Authorization'], \- b'AWS 0PN5J17HBGZHT7JJ3X82:xXjDGYUmKxnwqr5KXNPGldn5LbA=')+ self.assertEqual(httpreq.headers['Authorization'],+ b'AWS 0PN5J17HBGZHT7JJ3X82:xXjDGYUmKxnwqr5KXNPGldn5LbA=')def test_request_signing2(self):# puts an object into the johnsmith bucket.@@ -813,21 +813,22 @@ class S3TestCase(unittest.TestCase):})with self._mocked_date(date):httpreq = self.download_request(req, self.spider)- self.assertEqual(httpreq.headers['Authorization'], \- b'AWS 0PN5J17HBGZHT7JJ3X82:hcicpDDvL9SsO6AkvxqmIWkmOuQ=')+ self.assertEqual(httpreq.headers['Authorization'],+ b'AWS 0PN5J17HBGZHT7JJ3X82:hcicpDDvL9SsO6AkvxqmIWkmOuQ=')def test_request_signing3(self):# lists the content of the johnsmith bucket.date = 'Tue, 27 Mar 2007 19:42:41 +0000'- req = Request('s3://johnsmith/?prefix=photos&max-keys=50&marker=puppy', \- method='GET', headers={- 'User-Agent': 'Mozilla/5.0',- 'Date': date,- })+ req = Request(+ 's3://johnsmith/?prefix=photos&max-keys=50&marker=puppy',+ method='GET', headers={+ 'User-Agent': 'Mozilla/5.0',+ 'Date': date,+ })with self._mocked_date(date):httpreq = self.download_request(req, self.spider)- self.assertEqual(httpreq.headers['Authorization'], \- b'AWS 0PN5J17HBGZHT7JJ3X82:jsRt/rhG+Vtp88HrYL706QhE4w4=')+ self.assertEqual(httpreq.headers['Authorization'],+ b'AWS 0PN5J17HBGZHT7JJ3X82:jsRt/rhG+Vtp88HrYL706QhE4w4=')def test_request_signing4(self):# fetches the access control policy sub-resource for the 'johnsmith' bucket.@@ -836,8 +837,8 @@ class S3TestCase(unittest.TestCase):method='GET', headers={'Date': date})with self._mocked_date(date):httpreq = self.download_request(req, self.spider)- self.assertEqual(httpreq.headers['Authorization'], \- b'AWS 0PN5J17HBGZHT7JJ3X82:thdUi9VAkzhkniLj96JIrOPGi0g=')+ self.assertEqual(httpreq.headers['Authorization'],+ b'AWS 0PN5J17HBGZHT7JJ3X82:thdUi9VAkzhkniLj96JIrOPGi0g=')def test_request_signing5(self):try:@@ -850,11 +851,11 @@ class S3TestCase(unittest.TestCase):# deletes an object from the 'johnsmith' bucket using the# path-style and Date alternative.date = 'Tue, 27 Mar 2007 21:20:27 +0000'- req = Request('s3://johnsmith/photos/puppy.jpg', \- method='DELETE', headers={- 'Date': date,- 'x-amz-date': 'Tue, 27 Mar 2007 21:20:26 +0000',- })+ req = Request(+ 's3://johnsmith/photos/puppy.jpg', method='DELETE', headers={+ 'Date': date,+ 'x-amz-date': 'Tue, 27 Mar 2007 21:20:26 +0000',+ })with self._mocked_date(date):httpreq = self.download_request(req, self.spider)# botocore does not override Date with x-amz-date@@ -864,25 +865,26 @@ class S3TestCase(unittest.TestCase):def test_request_signing6(self):# uploads an object to a CNAME style virtual hosted bucket with metadata.date = 'Tue, 27 Mar 2007 21:06:08 +0000'- req = Request('s3://static.johnsmith.net:8080/db-backup.dat.gz', \- method='PUT', headers={- 'User-Agent': 'curl/7.15.5',- 'Host': 'static.johnsmith.net:8080',- 'Date': date,- 'x-amz-acl': 'public-read',- 'content-type': 'application/x-download',- 'Content-MD5': '4gJE4saaMU4BqNR0kLY+lw==',- 'X-Amz-Meta-ReviewedBy': '[email protected],[email protected]',- 'X-Amz-Meta-FileChecksum': '0x02661779',- 'X-Amz-Meta-ChecksumAlgorithm': 'crc32',- 'Content-Disposition': 'attachment; filename=database.dat',- 'Content-Encoding': 'gzip',- 'Content-Length': '5913339',- })+ req = Request(+ 's3://static.johnsmith.net:8080/db-backup.dat.gz',+ method='PUT', headers={+ 'User-Agent': 'curl/7.15.5',+ 'Host': 'static.johnsmith.net:8080',+ 'Date': date,+ 'x-amz-acl': 'public-read',+ 'content-type': 'application/x-download',+ 'Content-MD5': '4gJE4saaMU4BqNR0kLY+lw==',+ 'X-Amz-Meta-ReviewedBy': '[email protected],[email protected]',+ 'X-Amz-Meta-FileChecksum': '0x02661779',+ 'X-Amz-Meta-ChecksumAlgorithm': 'crc32',+ 'Content-Disposition': 'attachment; filename=database.dat',+ 'Content-Encoding': 'gzip',+ 'Content-Length': '5913339',+ })with self._mocked_date(date):httpreq = self.download_request(req, self.spider)- self.assertEqual(httpreq.headers['Authorization'], \- b'AWS 0PN5J17HBGZHT7JJ3X82:C0FlOtU8Ylb9KDTpZqYkZPX91iI=')+ self.assertEqual(httpreq.headers['Authorization'],+ b'AWS 0PN5J17HBGZHT7JJ3X82:C0FlOtU8Ylb9KDTpZqYkZPX91iI=')def test_request_signing7(self):# ensure that spaces are quoted properly before signingdiff --git a/tests/test_downloadermiddleware_retry.py b/tests/test_downloadermiddleware_retry.pyindex 51b79b6c3..e09d66086 100644--- a/tests/test_downloadermiddleware_retry.py+++ b/tests/test_downloadermiddleware_retry.py@@ -165,12 +165,12 @@ class MaxRetryTimesTest(unittest.TestCase):# SETTINGS: meta(max_retry_times) = 4meta_max_retry_times = 4- req = Request(self.invalid_url, meta= \- {'max_retry_times': meta_max_retry_times, 'dont_retry': True})+ req = Request(self.invalid_url, meta={+ 'max_retry_times': meta_max_retry_times, 'dont_retry': True+ })self._test_retry(req, DNSLookupError('foo'), 0)-def _test_retry(self, req, exception, max_retry_times):for i in range(0, max_retry_times):diff --git a/tests/test_engine.py b/tests/test_engine.pyindex 537df8d91..a48b63025 100644--- a/tests/test_engine.py+++ b/tests/test_engine.py@@ -91,8 +91,8 @@ def start_test_site(debug=False):port = reactor.listenTCP(0, server.Site(r), interface="127.0.0.1")if debug:- print("Test server running at http://localhost:%d/ - hit Ctrl-C to finish." \- % port.getHost().port)+ print("Test server running at http://localhost:%d/ - hit Ctrl-C to finish."+ % port.getHost().port)return portdiff --git a/tests/test_http_request.py b/tests/test_http_request.pyindex 57e7b457d..e30417b30 100644--- a/tests/test_http_request.py+++ b/tests/test_http_request.py@@ -622,8 +622,9 @@ class FormRequestTest(RequestTest):<input type="hidden" name="two" value="3"><input type="submit" name="clickable2" value="clicked2"></form>""")- req = self.request_class.from_response(response, formdata={'two': '2'}, \- clickdata={'name': 'clickable2'})+ req = self.request_class.from_response(+ response, formdata={'two': '2'}, clickdata={'name': 'clickable2'}+ )fs = _qs(req)self.assertEqual(fs[b'clickable2'], [b'clicked2'])self.assertFalse(b'clickable1' in fs, fs)@@ -671,8 +672,9 @@ class FormRequestTest(RequestTest):<input type="hidden" name="one" value="clicked1"><input type="hidden" name="two" value="clicked2"></form>""")- req = self.request_class.from_response(response, \- clickdata={u'name': u'clickable', u'value': u'clicked2'})+ req = self.request_class.from_response(+ response, clickdata={u'name': u'clickable', u'value': u'clicked2'}+ )fs = _qs(req)self.assertEqual(fs[b'clickable'], [b'clicked2'])self.assertEqual(fs[b'one'], [b'clicked1'])@@ -686,8 +688,9 @@ class FormRequestTest(RequestTest):<input type="hidden" name="poundsign" value="\u00a3"><input type="hidden" name="eurosign" value="\u20ac"></form>""")- req = self.request_class.from_response(response, \- clickdata={u'name': u'price in \u00a3'})+ req = self.request_class.from_response(+ response, clickdata={u'name': u'price in \u00a3'}+ )fs = _qs(req, to_unicode=True)self.assertTrue(fs[u'price in \u00a3'])@@ -700,8 +703,9 @@ class FormRequestTest(RequestTest):<input type="hidden" name="yensign" value="\u00a5"></form>""",encoding='latin1')- req = self.request_class.from_response(response, \- clickdata={u'name': u'price in \u00a5'})+ req = self.request_class.from_response(+ response, clickdata={u'name': u'price in \u00a5'}+ )fs = _qs(req, to_unicode=True, encoding='latin1')self.assertTrue(fs[u'price in \u00a5'])@@ -716,8 +720,9 @@ class FormRequestTest(RequestTest):<input type="hidden" name="field2" value="value2"></form>""")- req = self.request_class.from_response(response, formname='form2', \- clickdata={u'name': u'clickable'})+ req = self.request_class.from_response(+ response, formname='form2', clickdata={u'name': u'clickable'}+ )fs = _qs(req)self.assertEqual(fs[b'clickable'], [b'clicked2'])self.assertEqual(fs[b'field2'], [b'value2'])@@ -725,8 +730,9 @@ class FormRequestTest(RequestTest):def test_from_response_override_clickable(self):response = _buildresponse('''<form><input type="submit" name="clickme" value="one"> </form>''')- req = self.request_class.from_response(response, \- formdata={'clickme': 'two'}, clickdata={'name': 'clickme'})+ req = self.request_class.from_response(+ response, formdata={'clickme': 'two'}, clickdata={'name': 'clickme'}+ )fs = _qs(req)self.assertEqual(fs[b'clickme'], [b'two'])@@ -853,7 +859,7 @@ class FormRequestTest(RequestTest):<form name="form2" action="post.php" method="POST"><input type="hidden" name="two" value="2"></form>""")- self.assertRaises(IndexError, self.request_class.from_response, \+ self.assertRaises(IndexError, self.request_class.from_response,response, formname="form3", formnumber=2)def test_from_response_formid_exists(self):@@ -907,7 +913,7 @@ class FormRequestTest(RequestTest):<form id="form2" name="form2" action="post.php" method="POST"><input type="hidden" name="two" value="2"></form>""")- self.assertRaises(IndexError, self.request_class.from_response, \+ self.assertRaises(IndexError, self.request_class.from_response,response, formid="form3", formnumber=2)def test_from_response_select(self):diff --git a/tests/test_http_response.py b/tests/test_http_response.pyindex 79bb745cc..960ecea3e 100644--- a/tests/test_http_response.py+++ b/tests/test_http_response.py@@ -316,8 +316,8 @@ class TextResponseTest(BaseResponseTest):assert u'SUFFIX' in r.text, repr(r.text)# Do not destroy html tags due to encoding bugs- r = self.response_class("http://example.com", encoding='utf-8', \- body=b'\xf0<span>value</span>')+ r = self.response_class("http://example.com", encoding='utf-8',+ body=b'\xf0<span>value</span>')assert u'<span>value</span>' in r.text, repr(r.text)# FIXME: This test should pass once we stop using BeautifulSoup's UnicodeDammit in TextResponsediff --git a/tests/test_utils_http.py b/tests/test_utils_http.pyindex f9af4bf87..2fac3da1f 100644--- a/tests/test_utils_http.py+++ b/tests/test_utils_http.py@@ -13,7 +13,7 @@ class ChunkedTest(unittest.TestCase):chunked_body += "8\r\n" + "sequence\r\n"chunked_body += "0\r\n\r\n"body = decode_chunked_transfer(chunked_body)- self.assertEqual(body, \- "This is the data in the first chunk\r\n" +- "and this is the second one\r\n" +- "consequence")+ self.assertEqual(body,+ "This is the data in the first chunk\r\n" ++ "and this is the second one\r\n" ++ "consequence")