Skip to content

bpo-31908: Fix output of cover files for trace module command-line tool #4205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 10 commits into from
May 1, 2018
Merged

bpo-31908: Fix output of cover files for trace module command-line tool #4205

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
786e24d
flatten if/elif/else for line annotation
selik Nov 1, 2017
05b0e73
reorder condition for line annotation
selik Nov 1, 2017
ca64850
delete redundant condition
selik Nov 1, 2017
a16eb52
remove unused regex
selik Nov 1, 2017
3af4925
explain (comment) lnotab parameter
selik Nov 1, 2017
2f7cd82
write cover files regardless of show_missing
selik Nov 1, 2017
cdfed48
add news blurb
selik Nov 1, 2017
50fec11
Add testcase for verifying CLI output
selik Apr 23, 2018
c4524e4
Add test without --missing CLI option
selik Apr 25, 2018
560bc1f
fix test expected output indentation
selik May 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
reorder condition for line annotation 
A blank line will not appear in ``lnotab`` as returned by
``_find_executable_linenos``. Alternately, ``lnotab`` might be set to an
empty dict. Either way, the check for whether a line is blank can be
done after checking for whether the ``lineno`` is in ``lnotab``.
  • Loading branch information
@selik
selik committed Nov 1, 2017
commit 05b0e73963526247cba5b79be7497d655452cabb
4 changes: 2 additions & 2 deletions Lib/trace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,14 +324,14 @@ def write_results_file(self, path, lines, lnotab, lines_hit, encoding=None):
outfile.write("%5d: " % lines_hit[lineno])
n_hits += 1
n_lines += 1
elif rx_blank.match(line):
outfile.write(" ")
elif lineno in lnotab and not PRAGMA_NOCOVER in line:
# lines preceded by no marks weren't hit
# Highlight them if so indicated, unless the line contains
# #pragma: NO COVER
outfile.write(">>>>>> ")
n_lines += 1
elif rx_blank.match(line):
outfile.write(" ")
else:
outfile.write(" ")
outfile.write(line.expandtabs(8))
Expand Down