Scrapy, a fast high-level web crawling & scraping framework for Python.
Flake8: Remove E128 (commands module)
Eugenio Lacuesta2af34873cc38
diff --git a/pytest.ini b/pytest.iniindex 1570a3a75..d96ac9684 100644--- a/pytest.ini+++ b/pytest.ini@@ -31,18 +31,18 @@ flake8-ignore =extras/qps-bench-server.py E501extras/qpsclient.py E501 E501# scrapy/commands- scrapy/commands/__init__.py E128 E501+ scrapy/commands/__init__.py E501scrapy/commands/check.py E501scrapy/commands/crawl.py E501scrapy/commands/edit.py E501- scrapy/commands/fetch.py E501 E128- scrapy/commands/genspider.py E128 E501- scrapy/commands/parse.py E128 E501+ scrapy/commands/fetch.py E501+ scrapy/commands/genspider.py E501+ scrapy/commands/parse.py E501scrapy/commands/runspider.py E501- scrapy/commands/settings.py E128- scrapy/commands/shell.py E128 E501- scrapy/commands/startproject.py E501 E128- scrapy/commands/version.py E501 E128+ scrapy/commands/settings.py E501+ scrapy/commands/shell.py E501+ scrapy/commands/startproject.py E501+ scrapy/commands/version.py E501# scrapy/contractsscrapy/contracts/__init__.py E501scrapy/contracts/default.py E128diff --git a/scrapy/commands/__init__.py b/scrapy/commands/__init__.pyindex 9f8e6986a..97f818cb2 100644--- a/scrapy/commands/__init__.py+++ b/scrapy/commands/__init__.py@@ -59,17 +59,17 @@ class ScrapyCommand:"""group = OptionGroup(parser, "Global Options")group.add_option("--logfile", metavar="FILE",- help="log file. if omitted stderr will be used")+ help="log file. if omitted stderr will be used")group.add_option("-L", "--loglevel", metavar="LEVEL", default=None,- help="log level (default: %s)" % self.settings['LOG_LEVEL'])+ help="log level (default: %s)" % self.settings['LOG_LEVEL'])group.add_option("--nolog", action="store_true",- help="disable logging completely")+ help="disable logging completely")group.add_option("--profile", metavar="FILE", default=None,- help="write python cProfile stats to FILE")+ help="write python cProfile stats to FILE")group.add_option("--pidfile", metavar="FILE",- help="write process ID to FILE")+ help="write process ID to FILE")group.add_option("-s", "--set", action="append", default=[], metavar="NAME=VALUE",- help="set/override setting (may be repeated)")+ help="set/override setting (may be repeated)")group.add_option("--pdb", action="store_true", help="enable pdb on failure")parser.add_option_group(group)diff --git a/scrapy/commands/fetch.py b/scrapy/commands/fetch.pyindex 506d1f1b7..063195f50 100644--- a/scrapy/commands/fetch.py+++ b/scrapy/commands/fetch.py@@ -27,8 +27,8 @@ class Command(ScrapyCommand):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("--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/genspider.py b/scrapy/commands/genspider.pyindex 2e837abed..abf3b7a5c 100644--- a/scrapy/commands/genspider.py+++ b/scrapy/commands/genspider.py@@ -36,15 +36,15 @@ class Command(ScrapyCommand):def add_options(self, parser):ScrapyCommand.add_options(self, parser)parser.add_option("-l", "--list", dest="list", action="store_true",- help="List available templates")+ help="List available templates")parser.add_option("-e", "--edit", dest="edit", action="store_true",- help="Edit spider after creating it")+ help="Edit spider after creating it")parser.add_option("-d", "--dump", dest="dump", metavar="TEMPLATE",- help="Dump template to standard output")+ help="Dump template to standard output")parser.add_option("-t", "--template", dest="template", default="basic",- help="Uses a custom template.")+ help="Uses a custom template.")parser.add_option("--force", dest="force", action="store_true",- help="If the spider already exists, overwrite it with the template")+ help="If the spider already exists, overwrite it with the template")def run(self, args, opts):if opts.list:diff --git a/scrapy/commands/parse.py b/scrapy/commands/parse.pyindex 1cefed106..d9ab2126a 100644--- a/scrapy/commands/parse.py+++ b/scrapy/commands/parse.py@@ -33,29 +33,29 @@ class Command(ScrapyCommand):def add_options(self, parser):ScrapyCommand.add_options(self, parser)parser.add_option("--spider", dest="spider", default=None,- help="use this spider without looking for one")+ help="use this spider without looking for one")parser.add_option("-a", dest="spargs", action="append", default=[], metavar="NAME=VALUE",- help="set spider argument (may be repeated)")+ help="set spider argument (may be repeated)")parser.add_option("--pipelines", action="store_true",- help="process items through pipelines")+ help="process items through pipelines")parser.add_option("--nolinks", dest="nolinks", action="store_true",- help="don't show links to follow (extracted requests)")+ help="don't show links to follow (extracted requests)")parser.add_option("--noitems", dest="noitems", action="store_true",- help="don't show scraped items")+ help="don't show scraped items")parser.add_option("--nocolour", dest="nocolour", action="store_true",- help="avoid using pygments to colorize the output")+ help="avoid using pygments to colorize the output")parser.add_option("-r", "--rules", dest="rules", action="store_true",- help="use CrawlSpider rules to discover the callback")+ help="use CrawlSpider rules to discover the callback")parser.add_option("-c", "--callback", dest="callback",- help="use this callback for parsing, instead looking for a callback")+ help="use this callback for parsing, instead looking for a callback")parser.add_option("-m", "--meta", dest="meta",- help="inject extra meta into the Request, it must be a valid raw json string")+ help="inject extra meta into the Request, it must be a valid raw json string")parser.add_option("--cbkwargs", dest="cbkwargs",- help="inject extra callback kwargs into the Request, it must be a valid raw json string")+ help="inject extra callback kwargs into the Request, it must be a valid raw json string")parser.add_option("-d", "--depth", dest="depth", type="int", default=1,- help="maximum depth for parsing requests [default: %default]")+ help="maximum depth for parsing requests [default: %default]")parser.add_option("-v", "--verbose", dest="verbose", action="store_true",- help="print each depth level one by one")+ help="print each depth level one by one")@propertydef max_level(self):diff --git a/scrapy/commands/settings.py b/scrapy/commands/settings.pyindex 603bafb9f..8d49e440f 100644--- a/scrapy/commands/settings.py+++ b/scrapy/commands/settings.py@@ -19,15 +19,15 @@ class Command(ScrapyCommand):def add_options(self, parser):ScrapyCommand.add_options(self, parser)parser.add_option("--get", dest="get", metavar="SETTING",- help="print raw setting value")+ help="print raw setting value")parser.add_option("--getbool", dest="getbool", metavar="SETTING",- help="print setting value, interpreted as a boolean")+ help="print setting value, interpreted as a boolean")parser.add_option("--getint", dest="getint", metavar="SETTING",- help="print setting value, interpreted as an integer")+ help="print setting value, interpreted as an integer")parser.add_option("--getfloat", dest="getfloat", metavar="SETTING",- help="print setting value, interpreted as a float")+ help="print setting value, interpreted as a float")parser.add_option("--getlist", dest="getlist", metavar="SETTING",- help="print setting value, interpreted as a list")+ help="print setting value, interpreted as a list")def run(self, args, opts):settings = self.crawler_process.settingsdiff --git a/scrapy/commands/shell.py b/scrapy/commands/shell.pyindex 5946f21e8..d1944df3d 100644--- a/scrapy/commands/shell.py+++ b/scrapy/commands/shell.py@@ -34,11 +34,11 @@ class Command(ScrapyCommand):def add_options(self, parser):ScrapyCommand.add_options(self, parser)parser.add_option("-c", dest="code",- help="evaluate the code in the shell, print the result and exit")+ help="evaluate the code in the shell, print the result and exit")parser.add_option("--spider", dest="spider",- help="use this spider")- 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")+ help="use this spider")+ 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 update_vars(self, vars):"""You can use this function to update the Scrapy objects that will bediff --git a/scrapy/commands/startproject.py b/scrapy/commands/startproject.pyindex b123e5c84..ebe3a9c2c 100644--- a/scrapy/commands/startproject.py+++ b/scrapy/commands/startproject.py@@ -102,10 +102,8 @@ class Command(ScrapyCommand):move(join(project_dir, 'module'), join(project_dir, project_name))for paths in TEMPLATES_TO_RENDER:path = join(*paths)- tplfile = join(project_dir,- string.Template(path).substitute(project_name=project_name))- render_templatefile(tplfile, project_name=project_name,- ProjectName=string_camelcase(project_name))+ tplfile = join(project_dir, string.Template(path).substitute(project_name=project_name))+ render_templatefile(tplfile, project_name=project_name, ProjectName=string_camelcase(project_name))print("New Scrapy project '%s', using template directory '%s', ""created in:" % (project_name, self.templates_dir))print(" %s\n" % abspath(project_dir))diff --git a/scrapy/commands/version.py b/scrapy/commands/version.pyindex 1516c5997..d0ea72a67 100644--- a/scrapy/commands/version.py+++ b/scrapy/commands/version.py@@ -17,7 +17,7 @@ class Command(ScrapyCommand):def add_options(self, parser):ScrapyCommand.add_options(self, parser)parser.add_option("--verbose", "-v", dest="verbose", action="store_true",- help="also display twisted/python/platform info (useful for bug reports)")+ help="also display twisted/python/platform info (useful for bug reports)")def run(self, args, opts):if opts.verbose: