[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2 #14929

Mon May 28 05:06:41 CEST 2012

http://hg.python.org/cpython/rev/058c3099e82d
changeset: 77200:058c3099e82d
parent: 77198:81e008f13b4f
parent: 77199:12454f78967b
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sun May 27 23:06:14 2012 -0400
summary:
 Merge 3.2 #14929
files:
 Lib/idlelib/GrepDialog.py | 2 +-
 Misc/NEWS | 3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Lib/idlelib/GrepDialog.py b/Lib/idlelib/GrepDialog.py
--- a/Lib/idlelib/GrepDialog.py
+++ b/Lib/idlelib/GrepDialog.py
@@ -81,7 +81,7 @@
 hits = 0
 for fn in list:
 try:
- f = open(fn)
+ f = open(fn, errors='replace')
 except IOError as msg:
 print(msg)
 continue
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -49,6 +49,9 @@
 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.
 
-- 
Repository URL: http://hg.python.org/cpython
