tor

commit ec8c5b3fea78b2596d3b68571fd47b8e41d4a3ea
parent 157f7ba93ed8800dd34eafd4184a893b37965829
Author: George Kadianakis <desnacked@riseup.net>
Date:   Tue, 12 Mar 2019 14:35:26 +0200

practracker: Improvements based on last Nick's review.

Diffstat:
M
scripts/maint/practracker/metrics.py
 | 
6
+++---
M
scripts/maint/practracker/problem.py
 | 
3
++-
M
scripts/maint/practracker/util.py
 | 
2
+-

3 files changed, 6 insertions(+), 5 deletions(-)
diff --git 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
@@ -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
@@ -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):
     """