Merge with 3.3

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 = []