Only produce a dotted module name when writing output to a separate

directory.

diff --git a/Lib/trace.py b/Lib/trace.py
index 0a063c7638dbc519c7c1e10371d5e2889e353629..cda7258e4d3338f284c6e349a269a8ea6cfb6358 100644 (file)
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -163,7 +163,7 @@ def modname(path):
     return filename
 
 def fullmodname(path):
-    """Return a plausible module name for the patch."""
+    """Return a plausible module name for the path."""
 
     # If the file 'path' is part of a package, then the filename isn't
     # enough to uniquely identify it.  Try to do the right thing by
@@ -244,17 +244,18 @@ class CoverageResults:
             # skip some "files" we don't care about...
             if filename == "<string>":
                 continue
-            modulename = fullmodname(filename)
 
             if filename.endswith(".pyc") or filename.endswith(".pyo"):
                 filename = filename[:-1]
 
             if coverdir is None:
                 dir = os.path.dirname(os.path.abspath(filename))
+                modulename = modname(filename)
             else:
                 dir = coverdir
                 if not os.path.exists(dir):
                     os.makedirs(dir)
+                modulename = fullmodname(filename)
 
             # If desired, get a list of the line numbers which represent
             # executable content (returned as a dict for better lookup speed)