backout b98fc53, so that tip is clean for merging pull requests.

2 files changed, 6 insertions, 7 deletions

diff --git a/coverage/data.py b/coverage/data.py
index bfe4823a..2c5d3516 100644
--- a/coverage/data.py
+++ b/coverage/data.py
@@ -3,7 +3,7 @@
 import os
 
 from coverage.backward import iitems, pickle
-from coverage.files import PathAliases, abs_file
+from coverage.files import PathAliases
 from coverage.misc import file_be_gone
 
 
@@ -224,7 +224,7 @@ class CoverageData(object):
 
         """
         for filename, linenos in iitems(line_data):
-            self.lines.setdefault(abs_file(filename), {}).update(linenos)
+            self.lines.setdefault(filename, {}).update(linenos)
 
     def add_arc_data(self, arc_data):
         """Add measured arc data.
@@ -233,15 +233,14 @@ class CoverageData(object):
 
         """
         for filename, arcs in iitems(arc_data):
-            self.arcs.setdefault(abs_file(filename), {}).update(arcs)
+            self.arcs.setdefault(filename, {}).update(arcs)
 
     def add_plugin_data(self, plugin_data):
-        for filename, plugin_name in iitems(plugin_data):
-            self.plugins[abs_file(filename)] = plugin_name
+        self.plugins.update(plugin_data)
 
     def touch_file(self, filename):
         """Ensure that `filename` appears in the data, empty if needed."""
-        self.lines.setdefault(abs_file(filename), {})
+        self.lines.setdefault(filename, {})
 
     def measured_files(self):
         """A list of all files that had been measured."""
diff --git a/tests/plugin2.py b/tests/plugin2.py
index 1d5d9e9f..658ee221 100644
--- a/tests/plugin2.py
+++ b/tests/plugin2.py
@@ -25,7 +25,7 @@ class RenderFileTracer(coverage.plugin.FileTracer):
     def dynamic_source_filename(self, filename, frame):
         if frame.f_code.co_name != "render":
             return None
-        return frame.f_locals['filename']
+        return os.path.abspath(frame.f_locals['filename'])
 
     def line_number_range(self, frame):
         lineno = frame.f_locals['linenum']