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

[brett.cannon]

http://hg.python.org/cpython/rev/e1b5149adc3b
changeset:   86627:e1b5149adc3b
parent:      86625:e2c3f638c3d0
parent:      86626:f575f6298eb1
user:        Brett Cannon <brett at python.org>
date:        Fri Oct 25 13:49:20 2013 -0400
summary:
  merge from 3.3

files:
  Doc/library/imp.rst |  4 ++++
  1 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst
--- a/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@ -179,6 +179,10 @@
    the class does not affect the method definitions of the instances --- they
    continue to use the old class definition.  The same is true for derived classes.
 
+   .. versionchanged:: 3.3
+      Relies on both ``__name__`` and ``__loader__`` being defined on the module
+      being reloaded instead of just ``__name__``.
+
    .. deprecated:: 3.4
       Use :func:`importlib.reload` instead.
 

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