summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-10-12 17:10:10 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-10-12 17:10:10 (GMT)
commit4272d6a315ba0281ccfd5d4c842c53111e9f4ae3 (patch)
tree7e27db94e3d4da81566e19061ad4abb7bf23b243
parenta787b650d4dc728674b7c490d5aa8a3d10903fdc (diff)
downloadcpython-4272d6a315ba0281ccfd5d4c842c53111e9f4ae3.zip
cpython-4272d6a315ba0281ccfd5d4c842c53111e9f4ae3.tar.gz
cpython-4272d6a315ba0281ccfd5d4c842c53111e9f4ae3.tar.bz2
Fix some mentions of IOError
-rw-r--r--Doc/library/chunk.rst5
-rw-r--r--Doc/library/fileinput.rst5
-rw-r--r--Doc/library/signal.rst8
-rw-r--r--Doc/library/urllib.request.rst2
4 files changed, 14 insertions, 6 deletions
diff --git a/Doc/library/chunk.rst b/Doc/library/chunk.rst
index d3558a4..c1ba497 100644
--- a/Doc/library/chunk.rst
+++ b/Doc/library/chunk.rst
@@ -84,8 +84,9 @@ instance will fail with a :exc:`EOFError` exception.
Close and skip to the end of the chunk. This does not close the
underlying file.
- The remaining methods will raise :exc:`IOError` if called after the
- :meth:`close` method has been called.
+ The remaining methods will raise :exc:`OSError` if called after the
+ :meth:`close` method has been called. Before Python 3.3, they used to
+ raise :exc:`IOError`, now an alias of :exc:`OSError`.
.. method:: isatty()
diff --git a/Doc/library/fileinput.rst b/Doc/library/fileinput.rst
index ac44311..daefd99 100644
--- a/Doc/library/fileinput.rst
+++ b/Doc/library/fileinput.rst
@@ -28,7 +28,10 @@ as the first argument to :func:`.input`. A single file name is also allowed.
All files are opened in text mode by default, but you can override this by
specifying the *mode* parameter in the call to :func:`.input` or
:class:`FileInput`. If an I/O error occurs during opening or reading a file,
-:exc:`IOError` is raised.
+:exc:`OSError` is raised.
+
+.. versionchanged:: 3.3
+ :exc:`IOError` used to be raised; it is now an alias of :exc:`OSError`.
If ``sys.stdin`` is used more than once, the second and further use will return
no lines, except perhaps for interactive use, or if it has been explicitly reset
diff --git a/Doc/library/signal.rst b/Doc/library/signal.rst
index 9bca72e..cbb9534 100644
--- a/Doc/library/signal.rst
+++ b/Doc/library/signal.rst
@@ -145,7 +145,11 @@ The :mod:`signal` module defines one exception:
Raised to signal an error from the underlying :func:`setitimer` or
:func:`getitimer` implementation. Expect this error if an invalid
interval timer or a negative time is passed to :func:`setitimer`.
- This error is a subtype of :exc:`IOError`.
+ This error is a subtype of :exc:`OSError`.
+
+ .. versionadded:: 3.3
+ This error used to be a subtype of :exc:`IOError`, which is now an
+ alias of :exc:`OSError`.
The :mod:`signal` module defines the following functions:
@@ -396,7 +400,7 @@ be sent, and the handler raises an exception. ::
def handler(signum, frame):
print('Signal handler called with signal', signum)
- raise IOError("Couldn't open device!")
+ raise OSError("Couldn't open device!")
# Set the signal handler and a 5-second alarm
signal.signal(signal.SIGALRM, handler)
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 825398b..c08cbc6 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1172,7 +1172,7 @@ some point in the future.
*key_file* and *cert_file* are supported to provide an SSL key and certificate;
both are needed to support client authentication.
- :class:`URLopener` objects will raise an :exc:`IOError` exception if the server
+ :class:`URLopener` objects will raise an :exc:`OSError` exception if the server
returns an error code.
.. method:: open(fullurl, data=None)