[Python-checkins] cpython (merge 3.3 -> default): merge for issue #17357

[brett.cannon]

http://hg.python.org/cpython/rev/5fac0ac46f54
changeset:   83526:5fac0ac46f54
parent:      83524:d232cff25bbd
parent:      83525:75e32a0bfd74
user:        Brett Cannon <brett at python.org>
date:        Sat Apr 27 23:20:55 2013 -0400
summary:
  merge for issue #17357

files:
  Doc/library/importlib.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -109,9 +109,9 @@
 
    Invalidate the internal caches of finders stored at
    :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
-   some modules are installed while your program is running and you expect the
-   program to notice the changes.
+   will be called to perform the invalidation.  This function should be called
+   if any modules are created/installed while your program is running to
+   guarantee all finders will notice the new module's existence.
 
    .. versionadded:: 3.3
 
@@ -197,7 +197,7 @@
 
    .. versionadded:: 3.3
 
-   .. method:: find_loader(fullname):
+   .. method:: find_loader(fullname)
 
       An abstract method for finding a :term:`loader` for the specified
       module.  Returns a 2-tuple of ``(loader, portion)`` where ``portion``
@@ -212,7 +212,7 @@
       .. 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]``.

-- 
Repository URL: http://hg.python.org/cpython