mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 3.2 #14929

This commit is contained in:
Terry Jan Reedy 2012-05-27 23:06:14 -04:00
parent 7ef3ff3f2e e1c5087802
commit c6aa93cf22
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/idlelib/GrepDialog.py
View File

@ -81,7 +81,7 @@ def grep_it(self, prog, path):
hits = 0 hits = 0
for fn in list: for fn in list:
try: try:
f = open(fn) f = open(fn, errors='replace')
except IOError as msg: except IOError as msg:
print(msg) print(msg)
continue continue

3
Misc/NEWS
View File

@ -49,6 +49,9 @@ Core and Builtins
Library 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 - Issue #12515: email now registers a defect if it gets to EOF while parsing
a MIME part without seeing the closing MIME boundary. a MIME part without seeing the closing MIME boundary.