merge 3.1
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 4a0c7dc..17db9a2 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -907,7 +907,7 @@
 
          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.