summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib/GrepDialog.py
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2014-03-17 05:54:05 (GMT)
committerLarry Hastings <larry@hastings.org>2014-03-17 05:54:05 (GMT)
commit3c5c56f3c068bc13daea2275b951113b43a91e85 (patch)
tree1395bfb10902b7087a4ca1551f4bdb271b55ed43 /Lib/idlelib/GrepDialog.py
parente41b73caca2b543422f423a2ac07c29de834f44d (diff)
parent2221f666eba4a6f46f2095a801bc3e4bdbdb97d2 (diff)
downloadcpython-3c5c56f3c068bc13daea2275b951113b43a91e85.zip
cpython-3c5c56f3c068bc13daea2275b951113b43a91e85.tar.gz
cpython-3c5c56f3c068bc13daea2275b951113b43a91e85.tar.bz2
Merged default into 3.4 branch. 3.4 branch is now effectively 3.4.1rc1.
Diffstat (limited to 'Lib/idlelib/GrepDialog.py')
-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 = []