From a0600c388a4626d1ad7fd23e54091469335e4734 Mon Sep 17 00:00:00 2001 From: Stan Ulbrych Date: Mon, 19 May 2025 15:30:24 +0100 Subject: [PATCH 1/4] Add zstd info --- Lib/test/pythoninfo.py | 9 +++++++++ .../2025-05-19-15-30-00.gh-issue-132983.asdsfs.rst | 1 + 2 files changed, 10 insertions(+) create mode 100644 Misc/NEWS.d/next/Library/2025-05-19-15-30-00.gh-issue-132983.asdsfs.rst diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py index 682815c3fdd6e0..cd5d16d7d6494d 100644 --- a/Lib/test/pythoninfo.py +++ b/Lib/test/pythoninfo.py @@ -657,6 +657,14 @@ def collect_zlib(info_add): attributes = ('ZLIB_VERSION', 'ZLIB_RUNTIME_VERSION', 'ZLIBNG_VERSION') copy_attributes(info_add, zlib, 'zlib.%s', attributes) +def collect_zstd(info_add): + try: + import _zstd + except ImportError: + return + + attributes = ('zstd_version',) + copy_attributes(info_add, _zstd, 'zstd.%s', attributes) def collect_expat(info_add): try: @@ -1051,6 +1059,7 @@ def collect_info(info): collect_tkinter, collect_windows, collect_zlib, + collect_zstd, collect_libregrtest_utils, # Collecting from tests should be last as they have side effects. diff --git a/Misc/NEWS.d/next/Library/2025-05-19-15-30-00.gh-issue-132983.asdsfs.rst b/Misc/NEWS.d/next/Library/2025-05-19-15-30-00.gh-issue-132983.asdsfs.rst new file mode 100644 index 00000000000000..118d04c4463097 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-05-19-15-30-00.gh-issue-132983.asdsfs.rst @@ -0,0 +1 @@ +Add :mod:`compression.zstd` version information to ``test.pythoninfo``. From 7ede8bd1201765a0902d67ee5d014712755f820a Mon Sep 17 00:00:00 2001 From: Stan Ulbrych Date: Mon, 19 May 2025 20:03:34 +0100 Subject: [PATCH 2/4] PEP 8 --- Lib/test/pythoninfo.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py index cd5d16d7d6494d..411cc7c57036f5 100644 --- a/Lib/test/pythoninfo.py +++ b/Lib/test/pythoninfo.py @@ -664,6 +664,7 @@ def collect_zstd(info_add): return attributes = ('zstd_version',) + copy_attributes(info_add, _zstd, 'zstd.%s', attributes) def collect_expat(info_add): From ada56cc45e60c4b99cac9dc2235b863ee4edf6d3 Mon Sep 17 00:00:00 2001 From: Stan Ulbrych Date: Mon, 19 May 2025 20:04:08 +0100 Subject: [PATCH 3/4] Fixup I don't know how i messed that one up --- Lib/test/pythoninfo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py index 411cc7c57036f5..e1830f2e6eba97 100644 --- a/Lib/test/pythoninfo.py +++ b/Lib/test/pythoninfo.py @@ -657,6 +657,7 @@ def collect_zlib(info_add): attributes = ('ZLIB_VERSION', 'ZLIB_RUNTIME_VERSION', 'ZLIBNG_VERSION') copy_attributes(info_add, zlib, 'zlib.%s', attributes) + def collect_zstd(info_add): try: import _zstd @@ -664,9 +665,9 @@ def collect_zstd(info_add): return attributes = ('zstd_version',) - copy_attributes(info_add, _zstd, 'zstd.%s', attributes) + def collect_expat(info_add): try: from xml.parsers import expat From 4d381152bb28b89fd429a6be97177eeeaf363489 Mon Sep 17 00:00:00 2001 From: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com> Date: Mon, 19 May 2025 22:10:30 +0100 Subject: [PATCH 4/4] Update Misc/NEWS.d/next/Library/2025-05-19-15-30-00.gh-issue-132983.asdsfs.rst Co-authored-by: Victor Stinner --- .../next/Library/2025-05-19-15-30-00.gh-issue-132983.asdsfs.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Library/2025-05-19-15-30-00.gh-issue-132983.asdsfs.rst b/Misc/NEWS.d/next/Library/2025-05-19-15-30-00.gh-issue-132983.asdsfs.rst index 118d04c4463097..3893eeafa9c594 100644 --- a/Misc/NEWS.d/next/Library/2025-05-19-15-30-00.gh-issue-132983.asdsfs.rst +++ b/Misc/NEWS.d/next/Library/2025-05-19-15-30-00.gh-issue-132983.asdsfs.rst @@ -1 +1 @@ -Add :mod:`compression.zstd` version information to ``test.pythoninfo``. +Add :mod:`!compression.zstd` version information to ``test.pythoninfo``.