summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2019-03-12 14:35:26 +0200
committerNick Mathewson <nickm@torproject.org>2019-03-13 09:27:29 -0400
commitec8c5b3fea78b2596d3b68571fd47b8e41d4a3ea (patch)
tree1b5a309c84cdd9ff93bbf216c25ff7fb767598bd /scripts
parent157f7ba93ed8800dd34eafd4184a893b37965829 (diff)
downloadtor-ec8c5b3fea78b2596d3b68571fd47b8e41d4a3ea.tar.gz
tor-ec8c5b3fea78b2596d3b68571fd47b8e41d4a3ea.zip
practracker: Improvements based on last Nick's review.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/maint/practracker/metrics.py6
-rw-r--r--scripts/maint/practracker/problem.py3
-rw-r--r--scripts/maint/practracker/util.py2
3 files changed, 6 insertions, 5 deletions
diff --git a/scripts/maint/practracker/metrics.py b/scripts/maint/practracker/metrics.py
index c7d2091d05..56b9e8383e 100644
--- a/scripts/maint/practracker/metrics.py
+++ b/scripts/maint/practracker/metrics.py
@@ -26,8 +26,8 @@ def get_function_lines(f):
"""
# Skip lines with these terms since they confuse our regexp
- REGEXP_CONFUSE_TERMS = ["MOCK_IMPL", "ENABLE_GCC_WARNINGS", "ENABLE_GCC_WARNING", "DUMMY_TYPECHECK_INSTANCE",
- "DISABLE_GCC_WARNING", "DISABLE_GCC_WARNINGS"]
+ REGEXP_CONFUSE_TERMS = {"MOCK_IMPL", "ENABLE_GCC_WARNINGS", "ENABLE_GCC_WARNING", "DUMMY_TYPECHECK_INSTANCE",
+ "DISABLE_GCC_WARNING", "DISABLE_GCC_WARNINGS"}
in_function = False
for lineno, line in enumerate(f):
@@ -43,7 +43,7 @@ def get_function_lines(f):
in_function = True
else:
- # Fund the end of a function
+ # Find the end of a function
if line.startswith("}"):
n_lines = lineno - func_start
in_function = False
diff --git a/scripts/maint/practracker/problem.py b/scripts/maint/practracker/problem.py
index 00e029d1c4..60ee3eb242 100644
--- a/scripts/maint/practracker/problem.py
+++ b/scripts/maint/practracker/problem.py
@@ -8,6 +8,7 @@ get worse.
"""
import os.path
+import sys
class ProblemVault(object):
"""
@@ -23,7 +24,7 @@ class ProblemVault(object):
with open(exception_fname, 'r') as exception_f:
self.register_exceptions(exception_f)
except IOError:
- print("No exception file provided")
+ print("No exception file provided", file=sys.stderr)
def register_exceptions(self, exception_file):
# Register exceptions
diff --git a/scripts/maint/practracker/util.py b/scripts/maint/practracker/util.py
index 966c625158..63de72d5a3 100644
--- a/scripts/maint/practracker/util.py
+++ b/scripts/maint/practracker/util.py
@@ -2,7 +2,7 @@ import os
# We don't want to run metrics for unittests, automatically-generated C files,
# external libraries or git leftovers.
-EXCLUDE_SOURCE_DIRS = ["/src/test/", "/src/trunnel/", "/src/ext/", "/.git/"]
+EXCLUDE_SOURCE_DIRS = {"/src/test/", "/src/trunnel/", "/src/ext/", "/.git/"}
def get_tor_c_files(tor_topdir):
"""