summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-05-20 16:49:58 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-05-20 16:49:58 (GMT)
commit2ed7521e9635abd28fdef0fec1b6773f85ff2af6 (patch)
tree0cf54e86a55cd73d70445e9de43662d9a8ab3daf /Doc
parenta5a16bf532486d3279230623e9160435d011de3b (diff)
parent619323c68fe3b701fb3e50ee382ceec32f72c4fa (diff)
downloadcpython-2ed7521e9635abd28fdef0fec1b6773f85ff2af6.zip
cpython-2ed7521e9635abd28fdef0fec1b6773f85ff2af6.tar.gz
cpython-2ed7521e9635abd28fdef0fec1b6773f85ff2af6.tar.bz2
merge 3.2
Diffstat (limited to 'Doc')
-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 dfc910b..86f587f 100644
--- 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.