From f002cb44c601e6c874d8b6559003fc2710bfc17a Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 8 Jul 2023 23:13:36 +0200 Subject: [PATCH 1/2] gh-105376: Remove logging.warn() and LoggerAdapter.warn() --- Doc/library/logging.rst | 8 ++++++++ Doc/whatsnew/3.13.rst | 9 +++++---- Lib/logging/__init__.py | 12 +----------- .../2023-06-06-15-32-44.gh-issue-105376.W4oDQp.rst | 9 +++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index d7a389fa13d6a0..4e07eabd57f5e9 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -1015,6 +1015,10 @@ interchangeably. Attribute :attr:`manager` and method :meth:`_log` were added, which delegate to the underlying logger and allow adapters to be nested. +.. versionchanged:: 3.13 + Remove the undocumented ``warn()`` method which was an alias to the + ``warning()`` method. + Thread Safety ------------- @@ -1162,6 +1166,10 @@ functions. identical to ``warning``. As ``warn`` is deprecated, please do not use it - use ``warning`` instead. + .. versionchanged:: 3.13 + Remove the undocumented ``warn()`` function which was an alias to the + :func:`warning` function. + .. function:: error(msg, *args, **kwargs) diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst index b376f846b725e1..fad7ba3f4b4232 100644 --- a/Doc/whatsnew/3.13.rst +++ b/Doc/whatsnew/3.13.rst @@ -348,10 +348,11 @@ Removed use ``locale.setlocale(locale.LC_ALL, "")`` instead. (Contributed by Victor Stinner in :gh:`104783`.) -* Remove the undocumented and untested ``logging.Logger.warn()`` method, - deprecated since Python 3.3, which was an alias to the - :meth:`logging.Logger.warning` method: use the :meth:`logging.Logger.warning` - method instead. +* :mod:`logging`: Remove undocumented and untested ``Logger.warn()`` and + ``LoggerAdapter.warn()`` methods and ``logging.warn()`` function. Deprecated + since Python 3.3, they were aliases to the :meth:`logging.Logger.warning` + method, :meth:`logging.LoggerAdapter.warning` method and + :func:`logging.warning` function. (Contributed by Victor Stinner in :gh:`105376`.) * Remove *cafile*, *capath* and *cadefault* parameters of the diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index fe2039af0334a0..2a011b6d2ff15d 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -37,7 +37,7 @@ 'captureWarnings', 'critical', 'debug', 'disable', 'error', 'exception', 'fatal', 'getLevelName', 'getLogger', 'getLoggerClass', 'info', 'log', 'makeLogRecord', 'setLoggerClass', 'shutdown', - 'warn', 'warning', 'getLogRecordFactory', 'setLogRecordFactory', + 'warning', 'getLogRecordFactory', 'setLogRecordFactory', 'lastResort', 'raiseExceptions', 'getLevelNamesMapping', 'getHandlerByName', 'getHandlerNames'] @@ -1928,11 +1928,6 @@ def warning(self, msg, *args, **kwargs): """ self.log(WARNING, msg, *args, **kwargs) - def warn(self, msg, *args, **kwargs): - warnings.warn("The 'warn' method is deprecated, " - "use 'warning' instead", DeprecationWarning, 2) - self.warning(msg, *args, **kwargs) - def error(self, msg, *args, **kwargs): """ Delegate an error call to the underlying logger. @@ -2206,11 +2201,6 @@ def warning(msg, *args, **kwargs): basicConfig() root.warning(msg, *args, **kwargs) -def warn(msg, *args, **kwargs): - warnings.warn("The 'warn' function is deprecated, " - "use 'warning' instead", DeprecationWarning, 2) - warning(msg, *args, **kwargs) - def info(msg, *args, **kwargs): """ Log a message with severity 'INFO' on the root logger. If the logger has diff --git a/Misc/NEWS.d/next/Library/2023-06-06-15-32-44.gh-issue-105376.W4oDQp.rst b/Misc/NEWS.d/next/Library/2023-06-06-15-32-44.gh-issue-105376.W4oDQp.rst index a7d3172ca4c642..271a38afa66239 100644 --- a/Misc/NEWS.d/next/Library/2023-06-06-15-32-44.gh-issue-105376.W4oDQp.rst +++ b/Misc/NEWS.d/next/Library/2023-06-06-15-32-44.gh-issue-105376.W4oDQp.rst @@ -1,4 +1,5 @@ -Remove the undocumented and untested ``logging.Logger.warn()`` method, -deprecated since Python 3.3, which was an alias to the -:meth:`logging.Logger.warning` method: use the :meth:`logging.Logger.warning` -method instead. Patch by Victor Stinner. +:mod:`logging`: Remove undocumented and untested ``Logger.warn()`` and +``LoggerAdapter.warn()`` methods and ``logging.warn()`` function. Deprecated +since Python 3.3, they were aliases to the :meth:`logging.Logger.warning` +method, :meth:`logging.LoggerAdapter.warning` method and +:func:`logging.warning` function. Patch by Victor Stinner. From bd8a3dffd859b65affa110e6d342b8a48d3d9afe Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 8 Jul 2023 23:45:07 +0200 Subject: [PATCH 2/2] Fix doc --- Doc/whatsnew/3.13.rst | 2 +- .../next/Library/2023-06-06-15-32-44.gh-issue-105376.W4oDQp.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst index fad7ba3f4b4232..7a4ec5fd913033 100644 --- a/Doc/whatsnew/3.13.rst +++ b/Doc/whatsnew/3.13.rst @@ -351,7 +351,7 @@ Removed * :mod:`logging`: Remove undocumented and untested ``Logger.warn()`` and ``LoggerAdapter.warn()`` methods and ``logging.warn()`` function. Deprecated since Python 3.3, they were aliases to the :meth:`logging.Logger.warning` - method, :meth:`logging.LoggerAdapter.warning` method and + method, :meth:`!logging.LoggerAdapter.warning` method and :func:`logging.warning` function. (Contributed by Victor Stinner in :gh:`105376`.) diff --git a/Misc/NEWS.d/next/Library/2023-06-06-15-32-44.gh-issue-105376.W4oDQp.rst b/Misc/NEWS.d/next/Library/2023-06-06-15-32-44.gh-issue-105376.W4oDQp.rst index 271a38afa66239..2ed6b5e0a7ac0a 100644 --- a/Misc/NEWS.d/next/Library/2023-06-06-15-32-44.gh-issue-105376.W4oDQp.rst +++ b/Misc/NEWS.d/next/Library/2023-06-06-15-32-44.gh-issue-105376.W4oDQp.rst @@ -1,5 +1,5 @@ :mod:`logging`: Remove undocumented and untested ``Logger.warn()`` and ``LoggerAdapter.warn()`` methods and ``logging.warn()`` function. Deprecated since Python 3.3, they were aliases to the :meth:`logging.Logger.warning` -method, :meth:`logging.LoggerAdapter.warning` method and +method, :meth:`!logging.LoggerAdapter.warning` method and :func:`logging.warning` function. Patch by Victor Stinner. pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy