From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 6 Apr 2013 19:19:11 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v2.7.5~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e7df4312893db22f70de5d74ad56ef7a4f36746;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

0e7df4312893db22f70de5d74ad56ef7a4f36746
diff --cc Misc/NEWS
index 7f165dbdeec2,6bb4215d029c..79f49569b0d4
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -11,7 -11,13 +11,9 @@@ Core and Builtin
  
  Library
  -------
+ - Issue #14010: Fix a crash when iterating or deleting deeply nested filters
+   in itertools module (i.e. itertools.izip(), itertools.chain(), etc).
  
 -- Issue #14254: IDLE now handles readline correctly across shell restarts.
 -
 -- Issue #17614: IDLE no longer raises exception when quickly closing a file.
 -
  - Issue #13163: Rename operands in smtplib.SMTP._get_socket to correct names;
    fixes otherwise misleading output in tracebacks and when when debug is on.