From: Brett Cannon <brett@python.org>
Date: Fri, 25 Oct 2013 17:49:20 +0000 (-0400)
Subject: merge from 3.3
X-Git-Tag: v3.4.0b1~543
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50aa32409bd181d8739d05515f14aa5d2d0d7f10;p=thirdparty%2FPython%2Fcpython.git

merge from 3.3
---

50aa32409bd181d8739d05515f14aa5d2d0d7f10
diff --cc Doc/library/imp.rst
index 5253e69449d4,ebdbd4d443c1..6647b9e5b768
--- a/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@@ -179,9 -172,10 +179,13 @@@ This module provides an interface to th
     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.
 +
  
  The following functions are conveniences for handling :pep:`3147` byte-compiled
  file paths.