use the new source_for_file helper where it makes sense

--HG--
branch : issue-426

2 files changed, 3 insertions, 9 deletions

diff --git a/coverage/control.py b/coverage/control.py
index 376d3f54..79694320 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -810,8 +810,8 @@ class Coverage(object):
                 not hasattr(sys.modules[pkg], '__file__') or
                 not os.path.exists(sys.modules[pkg].__file__)):
                 continue
-            pkg_file = sys.modules[pkg].__file__
-            if not pkg_file.endswith(('__init__.py', '__init__.pyc', '__init__.pyo')):
+            pkg_file = source_for_file(sys.modules[pkg].__file__)
+            if not pkg_file.endswith('__init__.py'):
                 continue
             src_directories.append(self._canonical_dir(sys.modules[pkg]))
 
diff --git a/coverage/python.py b/coverage/python.py
index 5e142d24..f75be60a 100644
--- a/coverage/python.py
+++ b/coverage/python.py
@@ -139,13 +139,7 @@ class PythonFileReporter(FileReporter):
         else:
             filename = morf
 
-        filename = files.unicode_filename(filename)
-
-        # .pyc files should always refer to a .py instead.
-        if filename.endswith(('.pyc', '.pyo')):
-            filename = filename[:-1]
-        elif filename.endswith('$py.class'):   # Jython
-            filename = filename[:-9] + ".py"
+        filename = source_for_file(files.unicode_filename(filename))
 
         super(PythonFileReporter, self).__init__(files.canonical_filename(filename))