diff options
| -rw-r--r-- | coverage/files.py | 9 | ||||
| -rw-r--r-- | coverage/python.py | 10 |
2 files changed, 6 insertions, 13 deletions
diff --git a/coverage/files.py b/coverage/files.py index f1832207..8de2ec67 100644 --- a/coverage/files.py +++ b/coverage/files.py @@ -48,7 +48,7 @@ def relative_filename(filename): fnorm = os.path.normcase(filename) if fnorm.startswith(RELATIVE_DIR): filename = filename[len(RELATIVE_DIR):] - return unicode_filename(filename) + return filename @contract(returns='unicode') @@ -141,12 +141,6 @@ else: return filename -@contract(filename='unicode', returns='unicode') -def unicode_filename(filename): - """Return a Unicode version of `filename`.""" - return filename - - @contract(returns='unicode') def abs_file(path): """Return the absolute normalized form of `path`.""" @@ -156,7 +150,6 @@ def abs_file(path): pass path = os.path.abspath(path) path = actual_path(path) - path = unicode_filename(path) return path diff --git a/coverage/python.py b/coverage/python.py index 619857d9..969bfa89 100644 --- a/coverage/python.py +++ b/coverage/python.py @@ -7,8 +7,9 @@ import os.path import types import zipimport -from coverage import env, files +from coverage import env from coverage.exceptions import CoverageException, NoSource +from coverage.files import canonical_filename, relative_filename from coverage.misc import contract, expensive, isolate_module, join_regex from coverage.parser import PythonParser from coverage.phystokens import source_token_lines, source_encoding @@ -140,7 +141,7 @@ def source_for_morf(morf): else: filename = morf - filename = source_for_file(files.unicode_filename(filename)) + filename = source_for_file(filename) return filename @@ -152,16 +153,15 @@ class PythonFileReporter(FileReporter): filename = source_for_morf(morf) - super().__init__(files.canonical_filename(filename)) + super().__init__(canonical_filename(filename)) if hasattr(morf, '__name__'): name = morf.__name__.replace(".", os.sep) if os.path.basename(filename).startswith('__init__.'): name += os.sep + "__init__" name += ".py" - name = files.unicode_filename(name) else: - name = files.relative_filename(filename) + name = relative_filename(filename) self.relname = name self._source = None |