Change FileLocator from a class to module-level functions

1 files changed, 4 insertions, 5 deletions

diff --git a/coverage/xmlreport.py b/coverage/xmlreport.py
index 996f19a2..49b73122 100644
--- a/coverage/xmlreport.py
+++ b/coverage/xmlreport.py
@@ -5,7 +5,7 @@ import sys
 import time
 import xml.dom.minidom
 
-from coverage import __url__, __version__
+from coverage import __url__, __version__, files
 from coverage.report import Reporter
 
 
@@ -20,10 +20,9 @@ def rate(hit, num):
 class XmlReporter(Reporter):
     """A reporter for writing Cobertura-style XML coverage results."""
 
-    def __init__(self, coverage, config, file_locator):
+    def __init__(self, coverage, config):
         super(XmlReporter, self).__init__(coverage, config)
 
-        self.file_locator = file_locator
         self.source_paths = set()
         self.packages = {}
         self.xml_out = None
@@ -122,7 +121,7 @@ class XmlReporter(Reporter):
 
         # Create the 'lines' and 'package' XML elements, which
         # are populated later.  Note that a package == a directory.
-        filename = self.file_locator.relative_filename(fr.filename)
+        filename = files.relative_filename(fr.filename)
         filename = filename.replace("\\", "/")
         dirname = os.path.dirname(filename) or "."
         parts = dirname.split("/")
@@ -130,7 +129,7 @@ class XmlReporter(Reporter):
         package_name = dirname.replace("/", ".")
         className = fr.name
 
-        self.source_paths.add(self.file_locator.relative_dir.rstrip('/'))
+        self.source_paths.add(files.relative_directory().rstrip('/'))
         package = self.packages.setdefault(package_name, [{}, 0, 0, 0, 0])
 
         xclass = self.xml_out.createElement("class")