merge 3.1

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.