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

[brett.cannon]

http://hg.python.org/cpython/rev/37794a002517
changeset:   83928:37794a002517
parent:      83926:fbd1b092f937
parent:      83927:75707db4e2e9
user:        Brett Cannon <brett at python.org>
date:        Sat May 25 11:33:13 2013 -0400
summary:
  merge

files:
  Doc/reference/import.rst |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -353,7 +353,11 @@
  * The loader may set the ``__file__`` attribute of the module.  If set, this
    attribute's value must be a string.  The loader may opt to leave
    ``__file__`` unset if it has no semantic meaning (e.g. a module loaded from
-   a database).
+   a database). If ``__file__`` is set, it may also be appropriate to set the
+   ``__cached__`` attribute which is the path to any compiled version of the
+   code (e.g. byte-compiled file). The file does not need to exist to set this
+   attribute; the path can simply point to whether the compiled file would
+   exist (see :pep:`3147`).
 
  * The loader may set the ``__name__`` attribute of the module.  While not
    required, setting this attribute is highly recommended so that the

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