Commit8004b3d

committed

Merge remote-tracking branch 'upstream/main' into patch/curses-checks-125843

2 parents12d8805 +46d7c11 commit8004b3dCopy full SHA for 8004b3d

File tree

+12

-0

lines changed

+12

-0

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -658,6 +658,16 @@ def collect_zlib(info_add):`
`658`	`658`	`copy_attributes(info_add,zlib,'zlib.%s',attributes)`
`659`	`659`
`660`	`660`
	`661`	`+defcollect_zstd(info_add):`
	`662`	`+try:`
	`663`	`+import_zstd`
	`664`	`+exceptImportError:`
	`665`	`+return`
	`666`	`+`
	`667`	`+attributes= ('zstd_version',)`
	`668`	`+copy_attributes(info_add,_zstd,'zstd.%s',attributes)`
	`669`	`+`
	`670`	`+`
`661`	`671`	`defcollect_expat(info_add):`
`662`	`672`	`try:`
`663`	`673`	`fromxml.parsersimportexpat`
`@@ -1051,6 +1061,7 @@ def collect_info(info):`
`1051`	`1061`	`collect_tkinter,`
`1052`	`1062`	`collect_windows,`
`1053`	`1063`	`collect_zlib,`
	`1064`	`+collect_zstd,`
`1054`	`1065`	`collect_libregrtest_utils,`
`1055`	`1066`
`1056`	`1067`	`# Collecting from tests should be last as they have side effects.`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Add:mod:`!compression.zstd` version information to ``test.pythoninfo``.

Comments

(0)