From: Brett Cannon <brett@python.org>
Date: Sun, 28 Apr 2013 03:20:55 +0000 (-0400)
Subject: merge for issue #17357
X-Git-Tag: v3.4.0a1~842
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f6ee73c1e6338ff9494dea5a5473d9266eb66f5;p=python

merge for issue #17357
---

1f6ee73c1e6338ff9494dea5a5473d9266eb66f5
diff --cc Doc/library/importlib.rst
index e78a2eda70,0abf5e85bd..aeeb3fde4c
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@@ -205,14 -190,11 +205,14 @@@ ABC hierarchy:
        package. The loader may be ``None`` while specifying ``portion`` to
        signify the contribution of the file system locations to a namespace
        package. An empty list can be used for ``portion`` to signify the loader
 -      is not part of a package. If ``loader`` is ``None`` and ``portion`` is
 -      the empty list then no loader or location for a namespace package were
 -      found (i.e. failure to find anything for the module).
 +      is not part of a namespace package. If ``loader`` is ``None`` and
 +      ``portion`` is the empty list then no loader or location for a namespace
 +      package were found (i.e. failure to find anything for the module).
 +
 +      .. versionchanged:: 3.4
 +         Returns ``(None, [])`` instead of raising :exc:`NotImplementedError`.
  
-    .. method:: find_module(fullname):
+    .. method:: find_module(fullname)
  
        A concrete implementation of :meth:`Finder.find_module` which is
        equivalent to ``self.find_loader(fullname)[0]``.