summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-02-23 05:37:46 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-02-23 05:37:46 (GMT)
commita9daee3eb0db9abaffda4586229dd7db801aabad (patch)
treeadd2f965dfb1a9d3365e5ca8be409d8ec2bf76c2 /Lib/idlelib
parent1db0eacf3e12b97b6f56a6c6096203c07bdd475d (diff)
parentc3111fcbc7c431fe30dbcd6f4b31f4ad849c0eaf (diff)
downloadcpython-a9daee3eb0db9abaffda4586229dd7db801aabad.zip
cpython-a9daee3eb0db9abaffda4586229dd7db801aabad.tar.gz
cpython-a9daee3eb0db9abaffda4586229dd7db801aabad.tar.bz2
Merge with 3.3
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/GrepDialog.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/idlelib/GrepDialog.py b/Lib/idlelib/GrepDialog.py
index c0074e2..f73d70a 100644
--- a/Lib/idlelib/GrepDialog.py
+++ b/Lib/idlelib/GrepDialog.py
@@ -98,7 +98,7 @@ class GrepDialog(SearchDialogBase):
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 = []