diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2007-09-09 23:55:55 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2007-09-09 23:55:55 (GMT) |
| commit | c111d9fbbd1217147c3e1ee3374a0c87a8b94c93 (patch) | |
| tree | 1216c9fbcf27f0a9c0c960ac2dcfc37db8a918dc /Doc | |
| parent | c4119183a293a0be26cff1003f2c8a57c9049873 (diff) | |
| download | cpython-c111d9fbbd1217147c3e1ee3374a0c87a8b94c93.zip cpython-c111d9fbbd1217147c3e1ee3374a0c87a8b94c93.tar.gz cpython-c111d9fbbd1217147c3e1ee3374a0c87a8b94c93.tar.bz2 | |
merge this from trunk:
r58067 | gregory.p.smith | 2007-09-09 16:36:46 -0700 (Sun, 09 Sep 2007) | 22 lin
es
Change socket.error to inherit from IOError rather than being a stand
alone class. This addresses the primary concern in
http://bugs.python.org/issue1706815
python-dev discussion here:
http://mail.python.org/pipermail/python-dev/2007-July/073749.html
I chose IOError rather than EnvironmentError as the base class since
socket objects are often used as transparent duck typed file objects
in code already prepared to deal with IOError exceptions.
also a minor fix:
urllib2 - fix a couple places where IOError was raised rather than URLError.
for better or worse, URLError already inherits from IOError so
this won't break any existing code.
test_urllib2net - replace bad ftp urls.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/exceptions.rst | 3 | ||||
| -rw-r--r-- | Doc/library/socket.rst | 3 | ||||
| -rw-r--r-- | Doc/whatsnew/2.6.rst | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst index 9bc597e..c35d7d4 100644 --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -147,6 +147,9 @@ The following exceptions are the exceptions that are actually raised. This class is derived from :exc:`EnvironmentError`. See the discussion above for more information on exception instance attributes. + .. versionchanged:: 2.6 + Changed :exc:`socket.error` to use this as a base class. + .. exception:: ImportError diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index 758cfb1..7512e56 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -85,6 +85,9 @@ The module :mod:`socket` exports the following constants and functions: accompanying :exc:`os.error`. See the module :mod:`errno`, which contains names for the error codes defined by the underlying operating system. + .. versionchanged:: 2.6 + :exc:`socket.error` is now a child class of :exc:`IOError`. + .. exception:: herror diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst index dd537d3..154b103 100644 --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -282,7 +282,8 @@ Porting to Python 2.6 This section lists previously described changes that may require changes to your code: -* Everything is all in the details! +* The :mod:`socket` module exception :exc:`socket.error` now inherits from + :exc:`IOError`. .. % ====================================================================== |