summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2007-09-09 23:55:55 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2007-09-09 23:55:55 (GMT)
commitc111d9fbbd1217147c3e1ee3374a0c87a8b94c93 (patch)
tree1216c9fbcf27f0a9c0c960ac2dcfc37db8a918dc /Doc/whatsnew
parentc4119183a293a0be26cff1003f2c8a57c9049873 (diff)
downloadcpython-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/whatsnew')
-rw-r--r--Doc/whatsnew/2.6.rst3
1 files changed, 2 insertions, 1 deletions
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`.
.. % ======================================================================