diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-04-14 10:46:35 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-04-14 10:46:35 (GMT) |
| commit | 8a34596bbecdd5ad3dfd15df6fd4efa658e82765 (patch) | |
| tree | 4d76386a9ce7c6522f7039e217f26cfd6f934d2d | |
| parent | 96d6a78ce03e3642e83fe80cad3ef549cf8717ed (diff) | |
| download | cpython-8a34596bbecdd5ad3dfd15df6fd4efa658e82765.zip cpython-8a34596bbecdd5ad3dfd15df6fd4efa658e82765.tar.gz cpython-8a34596bbecdd5ad3dfd15df6fd4efa658e82765.tar.bz2 | |
#2118: IOError is deprecated, use OSError.
| -rw-r--r-- | Doc/library/smtplib.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/3.4.rst | 2 | ||||
| -rw-r--r-- | Lib/smtplib.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst index 04036dc..5762bb6 100644 --- a/Doc/library/smtplib.rst +++ b/Doc/library/smtplib.rst @@ -103,7 +103,7 @@ A nice selection of exceptions is defined as well: .. 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 index 2b6193a..ca515f6 100644 --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -162,7 +162,7 @@ detected. (Contributed by R. David Murray and Daniel Urban in :issue:`16522`.) 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 index a5a9fd4..cc46e4f 100644 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -66,7 +66,7 @@ bCRLF = b"\r\n" 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): |