commit fa0792c3a8e2f233efcebc8a89431ab9a1c877a2 Author: cypherpunks <cypherpunks@torproject.org> Date: Mon Dec 19 07:37:32 2016 +0000 Fix coding style issues in the changes file linter Found using flake8 which gave the following output; lintChanges.py:10:13: E225 missing whitespace around operator lintChanges.py:25:1: E302 expected 2 blank lines, found 1 lintChanges.py:46:5: F841 local variable 'lines' is assigned to but never used lintChanges.py:52:32: E228 missing whitespace around modulo operator lintChanges.py:53:11: E201 whitespace after '(' lintChanges.py:56:41: E228 missing whitespace around modulo operator Part of ticket 21096. --- scripts/maint/lintChanges.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py index b63a4eb..3694c4b 100755 --- a/scripts/maint/lintChanges.py +++ b/scripts/maint/lintChanges.py @@ -7,7 +7,7 @@ import re import os -KNOWN_GROUPS=set([ +KNOWN_GROUPS = set([ "Minor bugfix", "Minor bugfixes", "Major bugfix", @@ -22,6 +22,7 @@ KNOWN_GROUPS=set([ "Code simplification and refactoring", "Removed features"]) + def lintfile(fname): have_warned = [] @@ -43,17 +44,15 @@ def lintfile(fname): if bugnum and bugnum not in contents: warn("bug number {} does not appear".format(bugnum)) - lines = contents.split("\n") - m = re.match(r'^[ ]{2}o ([^\(:]*)([^:]*):', contents) if not m: warn("header not in format expected") elif m.group(1).strip() not in KNOWN_GROUPS: - warn("Weird header: %r"%m.group(1)) - elif ( ("bugfix" in m.group(1) or "feature" in m.group(1)) and - ("Removed" not in m.group(1)) and - '(' not in m.group(2)): - warn("Missing subcategory on %s"%m.group(1)) + warn("Weird header: %r" % m.group(1)) + elif (("bugfix" in m.group(1) or "feature" in m.group(1)) and + ("Removed" not in m.group(1)) and + '(' not in m.group(2)): + warn("Missing subcategory on %s" % m.group(1)) if m: isBug = ("bug" in m.group(1).lower() or "fix" in m.group(1).lower())