[Python-Dev] [Python-checkins] cpython (merge 3.3 -> default): merge for issue #18755

[Victor Stinner]

2013/8/23 brett.cannon <python-checkins at python.org>:
> http://hg.python.org/cpython/rev/7d30ecf5c916
> changeset:   85339:7d30ecf5c916
> parent:      85336:391f36ef461a
> parent:      85337:ddd610cb65ef
> user:        Brett Cannon <brett at python.org>
> date:        Fri Aug 23 11:52:19 2013 -0400
> summary:
>   merge for issue #18755
>
> files:
>   Lib/imp.py           |  9 +++++++--
>   Lib/test/test_imp.py |  9 +++++++++
>   2 files changed, 16 insertions(+), 2 deletions(-)

You didn't merge the log entry in Misc/NEWS. Is it voluntary?
Mercurial asked me to add the log entry when I merged 26c049dc1a4a
into default => 01f33959ddf6.

changeset:   85338:b107f7a8730d
branch:      3.3
user:        Brett Cannon <brett at python.org>
date:        Fri Aug 23 11:47:26 2013 -0400
files:       Misc/NEWS
description:
NEW entry for issue #18755


diff -r ddd610cb65ef -r b107f7a8730d Misc/NEWS
--- a/Misc/NEWS Fri Aug 23 11:45:57 2013 -0400
+++ b/Misc/NEWS Fri Aug 23 11:47:26 2013 -0400
@@ -66,6 +66,9 @@ Core and Builtins
 Library
 -------

+- Issue #18755: Fixed the loader used in imp to allow get_data() to be called
+  multiple times.
+
 - Issue #16809: Fixed some tkinter incompabilities with Tcl/Tk 8.6.

 - Issue #16809: Tkinter's splitlist() and split() methods now accept Tcl_Obj

Victor