summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-05-20 16:49:19 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-05-20 16:49:19 (GMT)
commit619323c68fe3b701fb3e50ee382ceec32f72c4fa (patch)
tree373a8299c89598761fba2a1a3c555bb3e305fe3b
parentc7dd737ef712b9b847dae35422ce3c64efc3d580 (diff)
parent2340986fe0a4637c6afdda81953973badfaaba73 (diff)
downloadcpython-619323c68fe3b701fb3e50ee382ceec32f72c4fa.zip
cpython-619323c68fe3b701fb3e50ee382ceec32f72c4fa.tar.gz
cpython-619323c68fe3b701fb3e50ee382ceec32f72c4fa.tar.bz2
merge 3.1
-rw-r--r--Doc/library/os.rst2
1 files changed, 1 insertions, 1 deletions
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 @@ 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.