From: Brett Cannon <brett@python.org>
Date: Sat, 25 May 2013 15:26:36 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0a1~638
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b39567a00e17122a3fd689e225c2b710ac96199b;p=thirdparty%2FPython%2Fcpython.git

merge
---

b39567a00e17122a3fd689e225c2b710ac96199b
diff --cc Doc/library/importlib.rst
index 9cb03be6e390,6f1899f3f506..c44a34583fe9
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@@ -456,22 -411,9 +460,23 @@@ ABC hierarchy:
          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.
 +
 +    .. method:: source_to_code(data, path)
 +
 +        Create a code object from Python source.
 +
 +        The *data* argument can be whatever the :func:`compile` function
 +        supports (i.e. string or bytes). The *path* argument should be
 +        the "path" to where the source code originated from, which can be an
 +        abstract concept (e.g. location in a zip file).
 +
 +        .. versionadded:: 3.4
 +
      .. method:: get_code(fullname)
  
          Concrete implementation of :meth:`InspectLoader.get_code`.