merge 3.2

2011-05-20 11:49:58 -05:00 · 2011-05-20 11:49:58 -05:00 · 2ed7521e96
parent a5a16bf532 619323c68f
commit 2ed7521e96
1 changed files with 1 additions and 1 deletions
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@ -1358,7 +1358,7 @@ Files and Directories

         try:
             fp = open("myfile")
-         except OSError as e:
+         except IOError as e:
             if e.errno == errno.EACCESS:
                 return "some default data"
             # Not a permission error.