From d8066b420b888591f485d132e62979d07abfc3f4 Mon Sep 17 00:00:00 2001 From: "Michael P. Nitowski" Date: Tue, 15 Mar 2022 05:01:03 -0400 Subject: [PATCH] bpo-46557: Log captured warnings without format string (GH-30975) --- Lib/logging/__init__.py | 4 +++- .../next/Library/2022-01-28-01-23-25.bpo-46557.XSbhyQ.rst | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2022-01-28-01-23-25.bpo-46557.XSbhyQ.rst diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index e49e0d02a80..160b1afcee0 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -2246,7 +2246,9 @@ def _showwarning(message, category, filename, lineno, file=None, line=None): logger = getLogger("py.warnings") if not logger.handlers: logger.addHandler(NullHandler()) - logger.warning("%s", s) + # bpo-46557: Log str(s) as msg instead of logger.warning("%s", s) + # since some log aggregation tools group logs by the msg arg + logger.warning(str(s)) def captureWarnings(capture): """ diff --git a/Misc/NEWS.d/next/Library/2022-01-28-01-23-25.bpo-46557.XSbhyQ.rst b/Misc/NEWS.d/next/Library/2022-01-28-01-23-25.bpo-46557.XSbhyQ.rst new file mode 100644 index 00000000000..dd7d3f3d6c5 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-01-28-01-23-25.bpo-46557.XSbhyQ.rst @@ -0,0 +1 @@ +Warnings captured by the logging module are now logged without a format string to prevent systems that group logs by the msg argument from grouping captured warnings together.