Remove the last vestige of FileReporter.name

6 files changed, 8 insertions, 13 deletions

diff --git a/coverage/control.py b/coverage/control.py
index 6a03db76..e4e67d3a 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -877,11 +877,6 @@ class Coverage(object):
         else:
             file_reporter = PythonFileReporter(morf, self)
 
-        # The FileReporter can have a name attribute, but if it doesn't, we'll
-        # supply it as the relative path to self.filename.
-        if not hasattr(file_reporter, "name"):
-            file_reporter.name = files.relative_filename(file_reporter.filename)
-
         return file_reporter
 
     def _get_file_reporters(self, morfs=None):
diff --git a/coverage/html.py b/coverage/html.py
index da23935d..62c13e29 100644
--- a/coverage/html.py
+++ b/coverage/html.py
@@ -248,7 +248,7 @@ class HtmlReporter(Reporter):
         index_info = {
             'nums': nums,
             'html_filename': html_filename,
-            'name': fr.name,
+            'relative_filename': fr.relative_filename(),
             }
         self.files.append(index_info)
         self.status.set_index_info(flat_rootname, index_info)
diff --git a/coverage/htmlfiles/index.html b/coverage/htmlfiles/index.html
index 1afc57c9..767de41e 100644
--- a/coverage/htmlfiles/index.html
+++ b/coverage/htmlfiles/index.html
@@ -83,7 +83,7 @@
         <tbody>
             {% for file in files %}
             <tr class="file">
-                <td class="name left"><a href="{{file.html_filename}}">{{file.name}}</a></td>
+                <td class="name left"><a href="{{file.html_filename}}">{{file.relative_filename}}</a></td>
                 <td>{{file.nums.n_statements}}</td>
                 <td>{{file.nums.n_missing}}</td>
                 <td>{{file.nums.n_excluded}}</td>
diff --git a/coverage/htmlfiles/pyfile.html b/coverage/htmlfiles/pyfile.html
index d78ba536..bf65ee59 100644
--- a/coverage/htmlfiles/pyfile.html
+++ b/coverage/htmlfiles/pyfile.html
@@ -5,7 +5,7 @@
     {# IE8 rounds line-height incorrectly, and adding this emulateIE7 line makes it right! #}
     {# http://social.msdn.microsoft.com/Forums/en-US/iewebdevelopment/thread/7684445e-f080-4d8f-8529-132763348e21 #}
     <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" />
-    <title>Coverage for {{fr.name|escape}}: {{nums.pc_covered_str}}%</title>
+    <title>Coverage for {{fr.relative_filename|escape}}: {{nums.pc_covered_str}}%</title>
     <link rel="stylesheet" href="style.css" type="text/css">
     {% if extra_css %}
         <link rel="stylesheet" href="{{ extra_css }}" type="text/css">
@@ -22,7 +22,7 @@
 
 <div id="header">
     <div class="content">
-        <h1>Coverage for <b>{{fr.name|escape}}</b> :
+        <h1>Coverage for <b>{{fr.relative_filename|escape}}</b> :
             <span class="pc_cov">{{nums.pc_covered_str}}%</span>
         </h1>
 
diff --git a/coverage/summary.py b/coverage/summary.py
index 49629b0a..60cb4151 100644
--- a/coverage/summary.py
+++ b/coverage/summary.py
@@ -23,7 +23,7 @@ class SummaryReporter(Reporter):
         self.find_file_reporters(morfs)
 
         # Prepare the formatting strings
-        max_name = max([len(fr.name) for fr in self.file_reporters] + [5])
+        max_name = max([len(fr.relative_filename()) for fr in self.file_reporters] + [5])
         fmt_name = "%%- %ds  " % max_name
         fmt_err = "%s   %s: %s\n"
         header = (fmt_name % "Name") + " Stmts   Miss"
@@ -65,7 +65,7 @@ class SummaryReporter(Reporter):
                     if no_missing_lines and no_missing_branches:
                         continue
 
-                args = (fr.name, nums.n_statements, nums.n_missing)
+                args = (fr.relative_filename(), nums.n_statements, nums.n_missing)
                 if self.branches:
                     args += (nums.n_branches, nums.n_partial_branches)
                 args += (nums.pc_covered_str,)
@@ -87,7 +87,7 @@ class SummaryReporter(Reporter):
                     if typ is NotPython and not fr.should_be_python():
                         report_it = False
                 if report_it:
-                    outfile.write(fmt_err % (fr.name, typ.__name__, msg))
+                    outfile.write(fmt_err % (fr.relative_filename(), typ.__name__, msg))
 
         if total.n_files > 1:
             outfile.write(rule)
diff --git a/coverage/xmlreport.py b/coverage/xmlreport.py
index 49b73122..9c7ab7c5 100644
--- a/coverage/xmlreport.py
+++ b/coverage/xmlreport.py
@@ -127,7 +127,7 @@ class XmlReporter(Reporter):
         parts = dirname.split("/")
         dirname = "/".join(parts[:self.config.xml_package_depth])
         package_name = dirname.replace("/", ".")
-        className = fr.name
+        className = fr.relative_filename()
 
         self.source_paths.add(files.relative_directory().rstrip('/'))
         package = self.packages.setdefault(package_name, [{}, 0, 0, 0, 0])