merge for issue #17357

This commit is contained in:
Brett Cannon 2013-04-27 23:20:55 -04:00
commit 1f6ee73c1e

View file

@ -109,9 +109,9 @@ Functions
Invalidate the internal caches of finders stored at Invalidate the internal caches of finders stored at
:data:`sys.meta_path`. If a finder implements ``invalidate_caches()`` then it :data:`sys.meta_path`. If a finder implements ``invalidate_caches()`` then it
will be called to perform the invalidation. This function may be needed if will be called to perform the invalidation. This function should be called
some modules are installed while your program is running and you expect the if any modules are created/installed while your program is running to
program to notice the changes. guarantee all finders will notice the new module's existence.
.. versionadded:: 3.3 .. versionadded:: 3.3
@ -197,7 +197,7 @@ ABC hierarchy::
.. versionadded:: 3.3 .. versionadded:: 3.3
.. method:: find_loader(fullname): .. method:: find_loader(fullname)
An abstract method for finding a :term:`loader` for the specified An abstract method for finding a :term:`loader` for the specified
module. Returns a 2-tuple of ``(loader, portion)`` where ``portion`` module. Returns a 2-tuple of ``(loader, portion)`` where ``portion``
@ -212,7 +212,7 @@ ABC hierarchy::
.. versionchanged:: 3.4 .. versionchanged:: 3.4
Returns ``(None, [])`` instead of raising :exc:`NotImplementedError`. 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 A concrete implementation of :meth:`Finder.find_module` which is
equivalent to ``self.find_loader(fullname)[0]``. equivalent to ``self.find_loader(fullname)[0]``.