[Python-checkins] cpython: #2118: IOError is deprecated, use OSError.

Sun Apr 14 12:46:53 CEST 2013

http://hg.python.org/cpython/rev/adc72ff451dc
changeset: 83363:adc72ff451dc
user: R David Murray <rdmurray at bitdance.com>
date: Sun Apr 14 06:46:35 2013 -0400
summary:
 #2118: IOError is deprecated, use OSError.
files:
 Doc/library/smtplib.rst | 2 +-
 Doc/whatsnew/3.4.rst | 2 +-
 Lib/smtplib.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst
--- a/Doc/library/smtplib.rst
+++ b/Doc/library/smtplib.rst
@@ -103,7 +103,7 @@
 
 .. exception:: SMTPException
 
- Subclass of :exc:`IOError` that is the base exception class for all
+ Subclass of :exc:`OSError` that is the base exception class for all
 the other excpetions provided by this module.
 
 
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -162,7 +162,7 @@
 smtplib
 -------
 
-:exc:`~smtplib.SMTPException` is now a subclass of :exc:`IOError`, which allows
+:exc:`~smtplib.SMTPException` is now a subclass of :exc:`OSError`, which allows
 both socket level errors and SMTP protocol level errors to be caught in one
 try/except statement by code that only cares whether or not an error occurred.
 (:issue:`2118`).
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -66,7 +66,7 @@
 OLDSTYLE_AUTH = re.compile(r"auth=(.*)", re.I)
 
 # Exception classes used by this module.
-class SMTPException(IOError):
+class SMTPException(OSError):
 """Base class for all exceptions raised by this module."""
 
 class SMTPServerDisconnected(SMTPException):
-- 
Repository URL: http://hg.python.org/cpython
