[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3

Sun Feb 23 06:38:42 CET 2014

http://hg.python.org/cpython/rev/659fff320e1e
changeset: 89331:659fff320e1e
parent: 89329:7b80f57f904e
parent: 89330:5c366a5e4284
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sun Feb 23 00:37:46 2014 -0500
summary:
 Merge with 3.3
files:
 Lib/idlelib/GrepDialog.py | 2 +-
 1 files changed, 1 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
@@ -98,7 +98,7 @@
 def findfiles(self, dir, base, rec):
 try:
 names = os.listdir(dir or os.curdir)
- except OSerror as msg:
+ except OSError as msg:
 print(msg)
 return []
 list = []
-- 
Repository URL: http://hg.python.org/cpython
