diff options
| author | Michael P. Nitowski <mpnitowski@gmail.com> | 2022-03-15 09:01:03 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-15 09:01:03 (GMT) |
| commit | d8066b420b888591f485d132e62979d07abfc3f4 (patch) | |
| tree | 169b3701864610187960e66cf42a31898bc0b655 | |
| parent | 16995ed0f2b697ca1ff966741288e787e1701ca9 (diff) | |
| download | cpython-d8066b420b888591f485d132e62979d07abfc3f4.zip cpython-d8066b420b888591f485d132e62979d07abfc3f4.tar.gz cpython-d8066b420b888591f485d132e62979d07abfc3f4.tar.bz2 | |
bpo-46557: Log captured warnings without format string (GH-30975)
| -rw-r--r-- | Lib/logging/__init__.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2022-01-28-01-23-25.bpo-46557.XSbhyQ.rst | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index e49e0d0..160b1af 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 0000000..dd7d3f3 --- /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. |