fix: more relative_files=true fixes. #1280

2 files changed, 10 insertions, 2 deletions

diff --git a/coverage/python.py b/coverage/python.py
index da43e6e8..c8b8e774 100644
--- a/coverage/python.py
+++ b/coverage/python.py
@@ -151,7 +151,14 @@ class PythonFileReporter(FileReporter):
 
         filename = source_for_morf(morf)
 
-        super().__init__(canonical_filename(filename))
+        fname = filename
+        canonicalize = True
+        if self.coverage is not None:
+            if self.coverage.config.relative_files:
+                canonicalize = False
+        if canonicalize:
+            fname = canonical_filename(filename)
+        super().__init__(fname)
 
         if hasattr(morf, '__name__'):
             name = morf.__name__.replace(".", os.sep)
diff --git a/coverage/xmlreport.py b/coverage/xmlreport.py
index 2c34cb54..5eb940bf 100644
--- a/coverage/xmlreport.py
+++ b/coverage/xmlreport.py
@@ -149,7 +149,8 @@ class XmlReporter:
         # are populated later.  Note that a package == a directory.
         filename = fr.filename.replace("\\", "/")
         for source_path in self.source_paths:
-            source_path = files.canonical_filename(source_path)
+            if not self.config.relative_files:
+                source_path = files.canonical_filename(source_path)
             if filename.startswith(source_path.replace("\\", "/") + "/"):
                 rel_name = filename[len(source_path)+1:]
                 break