From cd7fda993a11332523877f3f255000bbeff8436b Mon Sep 17 00:00:00 2001 From: Aditya Bansal Date: Thu, 18 May 2017 02:32:38 +0530 Subject: [PATCH] pep8: Add compliance with rule E261 to lint. --- tools/lint | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/lint b/tools/lint index a69f61e1f3..958529f9df 100755 --- a/tools/lint +++ b/tools/lint @@ -241,7 +241,7 @@ def build_custom_checkers(by_lang): 'exclude': set(['zerver/lib/bugdown/codehilite.py', 'tools/travis/success-http-headers.txt']), 'description': 'Fix tab-based whitespace'}, - ] # type: RuleList + ] # type: RuleList markdown_whitespace_rules = list([rule for rule in whitespace_rules if rule['pattern'] != '\s+$']) + [ # Two spaces trailing a line with other content is okay--it's a markdown line break. # This rule finds one space trailing a non-space, three or more trailing spaces, and @@ -252,7 +252,7 @@ def build_custom_checkers(by_lang): {'pattern': '^#+[A-Za-z0-9]', 'strip': '\n', 'description': 'Missing space after # in heading'}, - ] # type: RuleList + ] # type: RuleList js_rules = cast(RuleList, [ {'pattern': '[^_]function\(', 'description': 'The keyword "function" should be followed by a space'}, @@ -449,7 +449,7 @@ def build_custom_checkers(by_lang): {'pattern': '#!.*sh [-xe]', 'description': 'Fix shebang line with proper call to /usr/bin/env for Bash path, change -x|-e switches' ' to set -x|set -e'}, - ] + whitespace_rules[0:1] # type: RuleList + ] + whitespace_rules[0:1] # type: RuleList css_rules = cast(RuleList, [ {'pattern': '^[^:]*:\S[^:]*;$', 'description': "Missing whitespace after : in CSS"}, @@ -469,17 +469,17 @@ def build_custom_checkers(by_lang): 'description': "medium CSS attribute is under-specified, please use pixels."}, {'pattern': ' thick[; ]', 'description': "thick CSS attribute is under-specified, please use pixels."}, - ]) + whitespace_rules # type: RuleList + ]) + whitespace_rules # type: RuleList prose_style_rules = [ - {'pattern': '[^\/\#\-\"]([jJ]avascript)', # exclude usage in hrefs/divs + {'pattern': '[^\/\#\-\"]([jJ]avascript)', # exclude usage in hrefs/divs 'description': "javascript should be spelled JavaScript"}, - {'pattern': '[^\/\-\.\"\'\_\=\>]([gG]ithub)[^\.\-\_\"\<]', # exclude usage in hrefs/divs + {'pattern': '[^\/\-\.\"\'\_\=\>]([gG]ithub)[^\.\-\_\"\<]', # exclude usage in hrefs/divs 'description': "github should be spelled GitHub"}, - {'pattern': '[oO]rganisation', # exclude usage in hrefs/divs + {'pattern': '[oO]rganisation', # exclude usage in hrefs/divs 'description': "Organization is spelled with a z"}, {'pattern': '!!! warning', 'description': "!!! warning is invalid; it's spelled '!!! warn'"}, - ] # type: RuleList + ] # type: RuleList html_rules = whitespace_rules + prose_style_rules + [ {'pattern': 'placeholder="[^{]', 'description': "`placeholder` value should be translatable.", @@ -503,7 +503,7 @@ def build_custom_checkers(by_lang): ]), 'exclude': set(["templates/zerver/emails"]), 'description': "`title` value should be translatable."}, - ] # type: RuleList + ] # type: RuleList handlebars_rules = html_rules + [ {'pattern': "[<]script", 'description': "Do not use inline