mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#2118: IOError is deprecated, use OSError.

Browse source
This commit is contained in:
R David Murray 2013-04-14 06:46:35 -04:00
parent 96d6a78ce0
commit 8a34596bbe
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/smtplib.rst
View file

@ -103,7 +103,7 @@ A nice selection of exceptions is defined as well:
.. exception:: SMTPException .. 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. the other excpetions provided by this module.

2
Doc/whatsnew/3.4.rst
View file

@ -162,7 +162,7 @@ detected. (Contributed by R. David Murray and Daniel Urban in :issue:`16522`.)
smtplib 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 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. try/except statement by code that only cares whether or not an error occurred.
(:issue:`2118`). (:issue:`2118`).

2
Lib/smtplib.py
View file

@ -66,7 +66,7 @@ bCRLF = b"\r\n"
OLDSTYLE_AUTH = re.compile(r"auth=(.*)", re.I) OLDSTYLE_AUTH = re.compile(r"auth=(.*)", re.I)
# Exception classes used by this module. # Exception classes used by this module.
class SMTPException(IOError): class SMTPException(OSError):
"""Base class for all exceptions raised by this module.""" """Base class for all exceptions raised by this module."""
class SMTPServerDisconnected(SMTPException): class SMTPServerDisconnected(SMTPException):