[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/f94eb7ae6979
changeset:   70236:f94eb7ae6979
parent:      70232:43cf8fe70f67
parent:      70234:cfb6ee874b3e
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri May 20 11:49:58 2011 -0500
summary:
  merge 3.2

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
@@ -1358,7 +1358,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