merge 3.1

benjaminp · benjaminp · commit 619323c68fe3 · 2011-05-20T11:49:19.000-05:00
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
@@ -907,7 +907,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.
