[Python-checkins] cpython (merge 3.1 -> 3.2): merge 3.1
benjamin.peterson
python-checkins at python.org
Fri May 20 18:50:05 CEST 2011
http://hg.python.org/cpython/rev/cfb6ee874b3e
changeset: 70234:cfb6ee874b3e
branch: 3.2
parent: 70230:a341694216fc
parent: 70233:dd2f6a7e375e
user: Benjamin Peterson <benjamin at python.org>
date: Fri May 20 11:49:19 2011 -0500
summary:
merge 3.1
files:
Doc/library/os.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- 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.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list