From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 28 May 2012 03:06:14 +0000 (-0400)
Subject: Merge 3.2 #14929
X-Git-Tag: v3.3.0a4~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6aa93cf22a60f83f9c057dbde3f492d7010aa7a;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2 #14929
---

c6aa93cf22a60f83f9c057dbde3f492d7010aa7a
diff --cc Misc/NEWS
index 3e4157ecfded,2b457232f2e4..bd296cac7256
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -49,9 -67,9 +49,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue14929: Stop Idle 3.x from closing on Unicode decode errors when grepping.
+   Patch by Roger Serwy.
+ 
 +- Issue #12515: email now registers a defect if it gets to EOF while parsing
 +  a MIME part without seeing the closing MIME boundary.
 +
  - Issue12510: Attempting to get invalid tooltip no longer closes Idle.
    Original patch by Roger Serwy.