mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-27 22:03:31 +01:00
Merge branch 'practracker_comments'
This commit is contained in:
commit
c81b2b09ea
@ -10,6 +10,7 @@ get worse.
|
||||
from __future__ import print_function
|
||||
|
||||
import os.path
|
||||
import re
|
||||
import sys
|
||||
|
||||
class ProblemVault(object):
|
||||
@ -30,8 +31,15 @@ class ProblemVault(object):
|
||||
|
||||
def register_exceptions(self, exception_file):
|
||||
# Register exceptions
|
||||
for line in exception_file:
|
||||
problem = get_old_problem_from_exception_str(line)
|
||||
for lineno, line in enumerate(exception_file, 1):
|
||||
try:
|
||||
problem = get_old_problem_from_exception_str(line)
|
||||
except ValueError as v:
|
||||
print("Exception file line {} not recognized: {}"
|
||||
.format(lineno,v),
|
||||
file=sys.stderr)
|
||||
continue
|
||||
|
||||
if problem is None:
|
||||
continue
|
||||
|
||||
@ -122,11 +130,20 @@ class FunctionSizeProblem(Problem):
|
||||
def __init__(self, problem_location, metric_value):
|
||||
super(FunctionSizeProblem, self).__init__("function-size", problem_location, metric_value)
|
||||
|
||||
comment_re = re.compile(r'#.*$')
|
||||
|
||||
def get_old_problem_from_exception_str(exception_str):
|
||||
try:
|
||||
_, problem_type, problem_location, metric_value = exception_str.split(" ")
|
||||
except ValueError:
|
||||
orig_str = exception_str
|
||||
exception_str = comment_re.sub("", exception_str)
|
||||
fields = exception_str.split()
|
||||
if len(fields) == 0:
|
||||
# empty line or comment
|
||||
return None
|
||||
elif len(fields) == 4:
|
||||
# valid line
|
||||
_, problem_type, problem_location, metric_value = fields
|
||||
else:
|
||||
raise ValueError("Misformatted line {!r}".format(orig_str))
|
||||
|
||||
if problem_type == "file-size":
|
||||
return FileSizeProblem(problem_location, metric_value)
|
||||
@ -135,6 +152,4 @@ def get_old_problem_from_exception_str(exception_str):
|
||||
elif problem_type == "function-size":
|
||||
return FunctionSizeProblem(problem_location, metric_value)
|
||||
else:
|
||||
# print("Unknown exception line '{}'".format(exception_str))
|
||||
return None
|
||||
|
||||
raise ValueError("Unknown exception type {!r}".format(orig_str))
|
||||
|
Loading…
Reference in New Issue
Block a user