[Python-checkins] cpython (merge 3.3 -> default): merge

[brett.cannon]

http://hg.python.org/cpython/rev/eaa8f957351c
changeset:   83924:eaa8f957351c
parent:      83922:5245f0d849c6
parent:      83923:674005847047
user:        Brett Cannon <brett at python.org>
date:        Sat May 25 11:26:36 2013 -0400
summary:
  merge

files:
  Doc/library/importlib.rst |  11 ++++++++---
  1 files changed, 8 insertions(+), 3 deletions(-)


diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -256,6 +256,10 @@
             The path to where the module data is stored (not set for built-in
             modules).
 
+        - :attr:`__cached__`
+            The path to where a compiled version of the module is/should be
+            stored (not set when the attribute would be inappropriate).
+
         - :attr:`__path__`
             A list of strings specifying the search path within a
             package. This attribute is not set on modules.
@@ -456,7 +460,8 @@
         automatically.
 
         When writing to the path fails because the path is read-only
-        (:attr:`errno.EACCES`), do not propagate the exception.
+        (:attr:`errno.EACCES`/:exc:`PermissionError`), do not propagate the
+        exception.
 
         .. versionchanged:: 3.4
            No longer raises :exc:`NotImplementedError` when called.
@@ -595,8 +600,8 @@
      specified by *fullname* on :data:`sys.path` or, if defined, on
      *path*. For each path entry that is searched,
      :data:`sys.path_importer_cache` is checked. If a non-false object is
-     found then it is used as the :term:`finder` to look for the module
-     being searched for. If no entry is found in
+     found then it is used as the :term:`path entry finder` to look for the
+     module being searched for. If no entry is found in
      :data:`sys.path_importer_cache`, then :data:`sys.path_hooks` is
      searched for a finder for the path entry and, if found, is stored in
      :data:`sys.path_importer_cache` along with being queried about the

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