From d1c92d8e6b066a7b16d625b566853821afe8b46c Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Tue, 5 Jan 2016 14:48:41 -0500 Subject: Fix another form-feed problem, #461 --- coverage/phystokens.py | 3 +-- coverage/python.py | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'coverage') diff --git a/coverage/phystokens.py b/coverage/phystokens.py index 5aa3402c..5e80ed54 100644 --- a/coverage/phystokens.py +++ b/coverage/phystokens.py @@ -92,8 +92,7 @@ def source_token_lines(source): line = [] col = 0 - # The \f is because of http://bugs.python.org/issue19035 - source = source.expandtabs(8).replace('\r\n', '\n').replace('\f', ' ') + source = source.expandtabs(8).replace('\r\n', '\n') tokgen = generate_tokens(source) for ttype, ttext, (_, scol), (_, ecol), _ in phys_tokens(tokgen): diff --git a/coverage/python.py b/coverage/python.py index 5e563828..07d23472 100644 --- a/coverage/python.py +++ b/coverage/python.py @@ -50,6 +50,8 @@ def get_python_source(filename): # Couldn't find source. raise NoSource("No source for code: '%s'." % filename) + # Replace \f because of http://bugs.python.org/issue19035 + source = source.replace(b'\f', b' ') source = source.decode(source_encoding(source), "replace") # Python code should always end with a line with a newline. -- cgit v1.2.1