From a3cb81edd6053a273447ba3821655320ed234a41 Mon Sep 17 00:00:00 2001
From: buck <buck.2019@gmail.com>
Date: Wed, 15 Oct 2014 12:04:05 -0700
Subject: make --source and -m play nice together

--HG--
branch : __main__-support
extra : rebase_source : c9ca9fddecafddd5ef4db9cc64ca1c0972130aab
---
 coverage/cmdline.py |   3 +-
 coverage/control.py | 107 ++++++++++++++++++++++++++++------------------------
 coverage/files.py   |  44 +++++++++++++++++++++
 3 files changed, 104 insertions(+), 50 deletions(-)

(limited to 'coverage')

diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index e7efe5c4..a80d1168 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -519,9 +519,10 @@ class CoverageScript(object):
 
         # Set the first path element properly.
         old_path0 = sys.path[0]
+        main_module = args[0] if options.module else None
 
         # Run the script.
-        self.coverage.start()
+        self.coverage.start(main_module=main_module)
         code_ran = True
         try:
             if options.module:
diff --git a/coverage/control.py b/coverage/control.py
index 1191b9eb..5e154537 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -1,6 +1,6 @@
 """Core control stuff for Coverage."""
 
-import atexit, os, platform, random, socket, sys
+import atexit, inspect, os, platform, random, socket, sys
 
 from coverage.annotate import AnnotateReporter
 from coverage.backward import string_class, iitems
@@ -12,6 +12,7 @@ from coverage.debug import DebugControl
 from coverage.plugin import CoveragePlugin, Plugins, overrides
 from coverage.files import FileLocator, TreeMatcher, FnmatchMatcher
 from coverage.files import PathAliases, find_python_files, prep_patterns
+from coverage.files import ModuleMatcher
 from coverage.html import HtmlReporter
 from coverage.misc import CoverageException, bool_or_none, join_regex
 from coverage.misc import file_be_gone
@@ -140,7 +141,7 @@ class Coverage(object):
 
         # Other instance attributes, set later.
         self.omit = self.include = self.source = None
-        self.source_pkgs = self.file_locator = None
+        self.not_imported = self.source_pkgs = self.file_locator = None
         self.data = self.collector = None
         self.plugins = self.file_tracers = None
         self.pylib_dirs = self.cover_dir = None
@@ -198,6 +199,7 @@ class Coverage(object):
                 self.source.append(self.file_locator.canonical_filename(src))
             else:
                 self.source_pkgs.append(src)
+        self.not_imported = list(self.source_pkgs)
 
         self.omit = prep_patterns(self.config.omit)
         self.include = prep_patterns(self.config.include)
@@ -269,6 +271,7 @@ class Coverage(object):
         # Create the matchers we need for _should_trace
         if self.source or self.source_pkgs:
             self.source_match = TreeMatcher(self.source)
+            self.source_pkgs_match = ModuleMatcher(self.source_pkgs)
         else:
             if self.cover_dir:
                 self.cover_match = TreeMatcher([self.cover_dir])
@@ -303,6 +306,34 @@ class Coverage(object):
                 filename = filename[:-9] + ".py"
         return filename
 
+    def _name_for_module(self, module_namespace, filename):
+        """
+        For configurability's sake, we allow __main__ modules to be matched by their importable name.
+
+        If loaded via runpy (aka -m), we can usually recover the "original" full dotted module name,
+        otherwise, we resort to interpreting the filename to get the module's name.
+        In the case that the module name can't be deteremined, None is returned.
+        """
+        # TODO: unit-test
+        dunder_name = module_namespace.get('__name__', None)
+
+        if isinstance(dunder_name, str) and dunder_name != '__main__':
+            # this is the usual case: an imported module
+            return dunder_name
+
+        loader = module_namespace.get('__loader__', None)
+        if hasattr(loader, 'fullname') and isinstance(loader.fullname, str):
+            # module loaded via runpy -m
+            return loader.fullname
+
+        # script as first argument to python cli
+        inspectedname = inspect.getmodulename(filename)
+        if inspectedname is not None:
+            return inspectedname
+        else:
+            return dunder_name
+
+
     def _should_trace_with_reason(self, filename, frame):
         """Decide whether to trace execution in `filename`, with a reason.
 
@@ -318,8 +349,6 @@ class Coverage(object):
             disp.reason = reason
             return disp
 
-        self._check_for_packages()
-
         # Compiled Python files have two filenames: frame.f_code.co_filename is
         # the filename at the time the .pyc was compiled.  The second name is
         # __file__, which is where the .pyc was actually loaded from.  Since
@@ -334,6 +363,8 @@ class Coverage(object):
             # Empty string is pretty useless
             return nope(disp, "empty string isn't a filename")
 
+        modulename = self._name_for_module(frame.f_globals, filename)
+
         if filename.startswith('memory:'):
             return nope(disp, "memory isn't traceable")
 
@@ -373,7 +404,9 @@ class Coverage(object):
                         (plugin, disp.original_filename)
                     )
                 if disp.check_filters:
-                    reason = self._check_include_omit_etc(disp.source_filename)
+                    reason = self._check_include_omit_etc(
+                            disp.source_filename, modulename,
+                    )
                     if reason:
                         nope(disp, reason)
 
@@ -381,7 +414,7 @@ class Coverage(object):
 
         return nope(disp, "no plugin found")  # TODO: a test that causes this.
 
-    def _check_include_omit_etc(self, filename):
+    def _check_include_omit_etc(self, filename, modulename):
         """Check a filename against the include, omit, etc, rules.
 
         Returns a string or None.  String means, don't trace, and is the reason
@@ -393,6 +426,12 @@ class Coverage(object):
         # any canned exclusions. If they didn't, then we have to exclude the
         # stdlib and coverage.py directories.
         if self.source_match:
+            match = self.source_pkgs_match.match(modulename)
+            if match:
+                if modulename in self.not_imported:
+                    self.not_imported.remove(modulename)
+                return None  # There's no reason to skip this file.
+
             if not self.source_match.match(filename):
                 return "falls outside the --source trees"
         elif self.include_match:
@@ -448,46 +487,6 @@ class Coverage(object):
         self._warnings.append(msg)
         sys.stderr.write("Coverage.py warning: %s\n" % msg)
 
-    def _check_for_packages(self):
-        """Update the source_match matcher with latest imported packages."""
-        # Our self.source_pkgs attribute is a list of package names we want to
-        # measure.  Each time through here, we see if we've imported any of
-        # them yet.  If so, we add its file to source_match, and we don't have
-        # to look for that package any more.
-        if self.source_pkgs:
-            found = []
-            for pkg in self.source_pkgs:
-                try:
-                    mod = sys.modules[pkg]
-                except KeyError:
-                    continue
-
-                found.append(pkg)
-
-                try:
-                    pkg_file = mod.__file__
-                except AttributeError:
-                    pkg_file = None
-                else:
-                    d, f = os.path.split(pkg_file)
-                    if f.startswith('__init__'):
-                        # This is actually a package, return the directory.
-                        pkg_file = d
-                    else:
-                        pkg_file = self._source_for_file(pkg_file)
-                    pkg_file = self.file_locator.canonical_filename(pkg_file)
-                    if not os.path.exists(pkg_file):
-                        pkg_file = None
-
-                if pkg_file:
-                    self.source.append(pkg_file)
-                    self.source_match.add(pkg_file)
-                else:
-                    self._warn("Module %s has no Python source." % pkg)
-
-            for pkg in found:
-                self.source_pkgs.remove(pkg)
-
     def use_cache(self, usecache):
         """Control the use of a data file (incorrectly called a cache).
 
@@ -652,11 +651,21 @@ class Coverage(object):
         self.data.add_plugin_data(self.collector.get_plugin_data())
         self.collector.reset()
 
-        # If there are still entries in the source_pkgs list, then we never
+        # If there are still entries in the not_imported list, then we never
         # encountered those packages.
         if self._warn_unimported_source:
-            for pkg in self.source_pkgs:
-                self._warn("Module %s was never imported." % pkg)
+            for pkg in self.not_imported:
+                if pkg not in sys.modules:
+                    self._warn("Module %s was never imported." % pkg)
+                elif not hasattr(sys.modules[pkg], '__file__'):
+                    self._warn("Module %s has no Python source." % pkg)
+                else:
+                    raise AssertionError('''\
+Unexpected third case:
+    name: %s
+    object: %r
+    __file__: %s''' % (pkg, sys.modules[pkg], sys.modules[pkg].__file__)
+                    )
 
         # Find out if we got any data.
         summary = self.data.summary()
diff --git a/coverage/files.py b/coverage/files.py
index 1ed7276e..5e7c35aa 100644
--- a/coverage/files.py
+++ b/coverage/files.py
@@ -173,6 +173,50 @@ class TreeMatcher(object):
         return False
 
 
+class ModuleMatcher(object):
+    """A matcher for files in a tree."""
+    def __init__(self, module_names, main_module=None):
+        self.modules = list(module_names)
+        self.main_module = main_module
+        self.not_imported = list(module_names)
+
+    def __repr__(self):
+        if self.main_module:
+            main_module = ', main_module=%r' % self.main_module
+        else:
+            main_module = ''
+        return "<ModuleMatcher %r%s>" % (self.modules, main_module)
+
+    def info(self):
+        """A list of strings for displaying when dumping state."""
+        return ['main_module=%r' % self.main_module] + self.modules
+
+    def add(self, module):
+        """Add another directory to the list we match for."""
+        self.modules.append(module)
+
+    def match(self, module_name):
+        """Does `module_name` indicate a module in one of our packages?
+
+        On success, returns the matched module name, which can be different in
+        the case of __main__.
+        """
+        if not module_name:
+            return False
+        elif module_name == '__main__':
+            module_name = self.main_module or module_name
+
+        for m in self.modules:
+            if module_name.startswith(m):
+                if module_name == m:
+                    return module_name
+                if module_name[len(m)] == '.':
+                    # This is a module in the package
+                    return module_name
+
+        return False
+
+
 class FnmatchMatcher(object):
     """A matcher for files by filename pattern."""
     def __init__(self, pats):
-- 
cgit v1.2.1


From d05360a060187452f49302467f87ead09d27c9ba Mon Sep 17 00:00:00 2001
From: Buck Golemon <buck@yelp.com>
Date: Fri, 14 Nov 2014 14:00:27 -0800
Subject: ModuleFinder no longer takes a main-module argument.

--HG--
branch : __main__-support
extra : rebase_source : 3f4c29876960153907b65b6e8e818b8228ca4ec0
extra : histedit_source : 6567adaf9c89483b71501fd91e9d3c83ed3daec7%2C2c5c8a7af95b8b26af384b9a65815d077e4313ec
---
 coverage/cmdline.py |  3 +--
 coverage/control.py |  5 ++---
 coverage/files.py   | 20 +++++---------------
 3 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'coverage')

diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index a80d1168..e7efe5c4 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -519,10 +519,9 @@ class CoverageScript(object):
 
         # Set the first path element properly.
         old_path0 = sys.path[0]
-        main_module = args[0] if options.module else None
 
         # Run the script.
-        self.coverage.start(main_module=main_module)
+        self.coverage.start()
         code_ran = True
         try:
             if options.module:
diff --git a/coverage/control.py b/coverage/control.py
index 5e154537..47e5b508 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -141,7 +141,7 @@ class Coverage(object):
 
         # Other instance attributes, set later.
         self.omit = self.include = self.source = None
-        self.not_imported = self.source_pkgs = self.file_locator = None
+        self.source_pkgs = self.file_locator = None
         self.data = self.collector = None
         self.plugins = self.file_tracers = None
         self.pylib_dirs = self.cover_dir = None
@@ -426,8 +426,7 @@ class Coverage(object):
         # any canned exclusions. If they didn't, then we have to exclude the
         # stdlib and coverage.py directories.
         if self.source_match:
-            match = self.source_pkgs_match.match(modulename)
-            if match:
+            if self.source_pkgs_match.match(modulename):
                 if modulename in self.not_imported:
                     self.not_imported.remove(modulename)
                 return None  # There's no reason to skip this file.
diff --git a/coverage/files.py b/coverage/files.py
index 5e7c35aa..97888b62 100644
--- a/coverage/files.py
+++ b/coverage/files.py
@@ -175,21 +175,16 @@ class TreeMatcher(object):
 
 class ModuleMatcher(object):
     """A matcher for files in a tree."""
-    def __init__(self, module_names, main_module=None):
+    def __init__(self, module_names):
         self.modules = list(module_names)
-        self.main_module = main_module
         self.not_imported = list(module_names)
 
     def __repr__(self):
-        if self.main_module:
-            main_module = ', main_module=%r' % self.main_module
-        else:
-            main_module = ''
-        return "<ModuleMatcher %r%s>" % (self.modules, main_module)
+        return "<ModuleMatcher %r>" % (self.modules)
 
     def info(self):
         """A list of strings for displaying when dumping state."""
-        return ['main_module=%r' % self.main_module] + self.modules
+        return self.modules
 
     def add(self, module):
         """Add another directory to the list we match for."""
@@ -197,22 +192,17 @@ class ModuleMatcher(object):
 
     def match(self, module_name):
         """Does `module_name` indicate a module in one of our packages?
-
-        On success, returns the matched module name, which can be different in
-        the case of __main__.
         """
         if not module_name:
             return False
-        elif module_name == '__main__':
-            module_name = self.main_module or module_name
 
         for m in self.modules:
             if module_name.startswith(m):
                 if module_name == m:
-                    return module_name
+                    return True
                 if module_name[len(m)] == '.':
                     # This is a module in the package
-                    return module_name
+                    return True
 
         return False
 
-- 
cgit v1.2.1


From 7ca11054c5b0f91bd77c16923ec443ccee6f2dd9 Mon Sep 17 00:00:00 2001
From: Buck Golemon <buck@yelp.com>
Date: Fri, 14 Nov 2014 14:00:48 -0800
Subject: shim for pep302 __loader__

--HG--
branch : __main__-support
extra : histedit_source : f07b26f0cfc575d81972546f1b7ae2ece84e2d87
---
 coverage/execfile.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'coverage')

diff --git a/coverage/execfile.py b/coverage/execfile.py
index 82cc2217..f03713ec 100644
--- a/coverage/execfile.py
+++ b/coverage/execfile.py
@@ -7,6 +7,15 @@ from coverage.backward import PYC_MAGIC_NUMBER, imp, importlib_util_find_spec
 from coverage.misc import ExceptionDuringRun, NoCode, NoSource
 
 
+class DummyLoader(object):
+    """A shim for the pep302 __loader__, emulating pkgutil.ImpLoader.
+
+    Currently only implements the .fullname attribute
+    """
+    def __init__(self, fullname, *args):
+        self.fullname = fullname
+
+
 if importlib_util_find_spec:
     def find_module(modulename):
         """Find the module named `modulename`.
@@ -92,10 +101,10 @@ def run_python_module(modulename, args):
 
     pathname = os.path.abspath(pathname)
     args[0] = pathname
-    run_python_file(pathname, args, package=packagename)
+    run_python_file(pathname, args, package=packagename, modulename=modulename)
 
 
-def run_python_file(filename, args, package=None):
+def run_python_file(filename, args, package=None, modulename=None):
     """Run a python file as if it were the main program on the command line.
 
     `filename` is the path to the file to execute, it need not be a .py file.
@@ -111,6 +120,9 @@ def run_python_file(filename, args, package=None):
     main_mod.__file__ = filename
     if package:
         main_mod.__package__ = package
+    if modulename:
+        main_mod.__loader__ = DummyLoader(modulename)
+
     main_mod.__builtins__ = BUILTINS
 
     # Set sys.argv properly.
-- 
cgit v1.2.1


From 148a2291e1e7b04eecaa15c90b125cc8199d7974 Mon Sep 17 00:00:00 2001
From: Buck Golemon <buck@yelp.com>
Date: Fri, 14 Nov 2014 16:33:41 -0800
Subject: they changed the way __loader__ looks in 3.3

--HG--
branch : __main__-support
extra : amend_source : 7abd8465667b4bd4b3eeac24391c27c68edf9a95
---
 coverage/control.py  | 11 ++++++++---
 coverage/execfile.py |  8 +++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'coverage')

diff --git a/coverage/control.py b/coverage/control.py
index 47e5b508..7a85103b 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -322,9 +322,14 @@ class Coverage(object):
             return dunder_name
 
         loader = module_namespace.get('__loader__', None)
-        if hasattr(loader, 'fullname') and isinstance(loader.fullname, str):
-            # module loaded via runpy -m
-            return loader.fullname
+        for attrname in ('fullname', 'name'): # attribute renamed in py3.2
+            if (
+                hasattr(loader, 'fullname') and
+                isinstance(loader.fullname, str) and
+                loader.fullname != '__main__'
+            ):
+                # module loaded via runpy -m
+                return loader.fullname
 
         # script as first argument to python cli
         inspectedname = inspect.getmodulename(filename)
diff --git a/coverage/execfile.py b/coverage/execfile.py
index f03713ec..4b5f3af4 100644
--- a/coverage/execfile.py
+++ b/coverage/execfile.py
@@ -7,6 +7,12 @@ from coverage.backward import PYC_MAGIC_NUMBER, imp, importlib_util_find_spec
 from coverage.misc import ExceptionDuringRun, NoCode, NoSource
 
 
+if sys.version_info >= (3, 3):
+    DEFAULT_FULLNAME = '__main__'
+else:
+    DEFAULT_FULLNAME = None
+
+
 class DummyLoader(object):
     """A shim for the pep302 __loader__, emulating pkgutil.ImpLoader.
 
@@ -104,7 +110,7 @@ def run_python_module(modulename, args):
     run_python_file(pathname, args, package=packagename, modulename=modulename)
 
 
-def run_python_file(filename, args, package=None, modulename=None):
+def run_python_file(filename, args, package=None, modulename=DEFAULT_FULLNAME):
     """Run a python file as if it were the main program on the command line.
 
     `filename` is the path to the file to execute, it need not be a .py file.
-- 
cgit v1.2.1


From ae3deed9e39b528abc2259a2fe7f7178623fce8e Mon Sep 17 00:00:00 2001
From: Buck Golemon <buck@yelp.com>
Date: Fri, 14 Nov 2014 17:19:00 -0800
Subject: pypy3 sets sys.__file__ to a nonexistant file

--HG--
branch : __main__-support
---
 coverage/control.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'coverage')

diff --git a/coverage/control.py b/coverage/control.py
index 7a85103b..1b932da3 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -661,7 +661,10 @@ class Coverage(object):
             for pkg in self.not_imported:
                 if pkg not in sys.modules:
                     self._warn("Module %s was never imported." % pkg)
-                elif not hasattr(sys.modules[pkg], '__file__'):
+                elif not (
+                    hasattr(sys.modules[pkg], '__file__') and
+                    os.path.exists(sys.modules[pkg].__file__)
+                ):
                     self._warn("Module %s has no Python source." % pkg)
                 else:
                     raise AssertionError('''\
-- 
cgit v1.2.1


From 5082e667fbc65db03d32138fcdfa087a6fc073a6 Mon Sep 17 00:00:00 2001
From: Buck Golemon <buck@yelp.com>
Date: Fri, 14 Nov 2014 17:52:52 -0800
Subject: ned code review, part 1

--HG--
branch : __main__-support
---
 coverage/control.py | 9 ++++-----
 coverage/files.py   | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'coverage')

diff --git a/coverage/control.py b/coverage/control.py
index 1b932da3..6a136da4 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -199,7 +199,6 @@ class Coverage(object):
                 self.source.append(self.file_locator.canonical_filename(src))
             else:
                 self.source_pkgs.append(src)
-        self.not_imported = list(self.source_pkgs)
 
         self.omit = prep_patterns(self.config.omit)
         self.include = prep_patterns(self.config.include)
@@ -432,8 +431,8 @@ class Coverage(object):
         # stdlib and coverage.py directories.
         if self.source_match:
             if self.source_pkgs_match.match(modulename):
-                if modulename in self.not_imported:
-                    self.not_imported.remove(modulename)
+                if modulename in self.source_pkgs:
+                    self.source_pkgs.remove(modulename)
                 return None  # There's no reason to skip this file.
 
             if not self.source_match.match(filename):
@@ -655,10 +654,10 @@ class Coverage(object):
         self.data.add_plugin_data(self.collector.get_plugin_data())
         self.collector.reset()
 
-        # If there are still entries in the not_imported list, then we never
+        # If there are still entries in the source_pkgs list, then we never
         # encountered those packages.
         if self._warn_unimported_source:
-            for pkg in self.not_imported:
+            for pkg in self.source_pkgs:
                 if pkg not in sys.modules:
                     self._warn("Module %s was never imported." % pkg)
                 elif not (
diff --git a/coverage/files.py b/coverage/files.py
index 97888b62..332c4225 100644
--- a/coverage/files.py
+++ b/coverage/files.py
@@ -174,10 +174,9 @@ class TreeMatcher(object):
 
 
 class ModuleMatcher(object):
-    """A matcher for files in a tree."""
+    """A matcher for modules in a tree."""
     def __init__(self, module_names):
         self.modules = list(module_names)
-        self.not_imported = list(module_names)
 
     def __repr__(self):
         return "<ModuleMatcher %r>" % (self.modules)
-- 
cgit v1.2.1


From b3ccb75241566c1e1a814ae99a84637fd0ac2b44 Mon Sep 17 00:00:00 2001
From: Buck Golemon <buck@yelp.com>
Date: Sat, 15 Nov 2014 14:01:06 -0800
Subject: add necessary tests, fix attrname, once it was shown to fail

--HG--
branch : __main__-support
---
 coverage/control.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'coverage')

diff --git a/coverage/control.py b/coverage/control.py
index 6a136da4..e568f643 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -322,13 +322,17 @@ class Coverage(object):
 
         loader = module_namespace.get('__loader__', None)
         for attrname in ('fullname', 'name'): # attribute renamed in py3.2
+            if hasattr(loader, attrname):
+                fullname = getattr(loader, attrname)
+            else:
+                continue
+
             if (
-                hasattr(loader, 'fullname') and
-                isinstance(loader.fullname, str) and
-                loader.fullname != '__main__'
+                isinstance(fullname, str) and
+                fullname != '__main__'
             ):
                 # module loaded via runpy -m
-                return loader.fullname
+                return fullname
 
         # script as first argument to python cli
         inspectedname = inspect.getmodulename(filename)
-- 
cgit v1.2.1