|
 |
433e38e |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
433e38e |
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
|
|
433e38e |
Date: Tue, 5 Dec 2023 21:02:06 +0100
|
|
|
433e38e |
Subject: [PATCH] 00419: gh-112769: test_zlib: Fix comparison of
|
|
|
433e38e |
ZLIB_RUNTIME_VERSION with non-int suffix (GH-112771) (GH-112774)
|
|
|
433e38e |
|
|
|
433e38e |
zlib-ng defines the version as "1.3.0.zlib-ng".
|
|
|
433e38e |
(cherry picked from commit d384813ff18b33280a90b6d2011654528a2b6ad1)
|
|
|
433e38e |
---
|
|
|
433e38e |
Lib/test/test_zlib.py | 28 ++++++++++++++++------------
|
|
|
433e38e |
1 file changed, 16 insertions(+), 12 deletions(-)
|
|
|
433e38e |
|
|
|
433e38e |
diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
|
|
|
433e38e |
index cb0610837b..98cac4fb91 100644
|
|
|
433e38e |
--- a/Lib/test/test_zlib.py
|
|
|
433e38e |
+++ b/Lib/test/test_zlib.py
|
|
|
433e38e |
@@ -19,6 +19,20 @@
|
|
|
433e38e |
'requires Decompress.copy()')
|
|
|
433e38e |
|
|
|
433e38e |
|
|
|
433e38e |
+def _zlib_runtime_version_tuple(zlib_version=zlib.ZLIB_RUNTIME_VERSION):
|
|
|
433e38e |
+ # Register "1.2.3" as "1.2.3.0"
|
|
|
433e38e |
+ # or "1.2.0-linux","1.2.0.f","1.2.0.f-linux"
|
|
|
433e38e |
+ v = zlib_version.split('-', 1)[0].split('.')
|
|
|
433e38e |
+ if len(v) < 4:
|
|
|
433e38e |
+ v.append('0')
|
|
|
433e38e |
+ elif not v[-1].isnumeric():
|
|
|
433e38e |
+ v[-1] = '0'
|
|
|
433e38e |
+ return tuple(map(int, v))
|
|
|
433e38e |
+
|
|
|
433e38e |
+
|
|
|
433e38e |
+ZLIB_RUNTIME_VERSION_TUPLE = _zlib_runtime_version_tuple()
|
|
|
433e38e |
+
|
|
|
433e38e |
+
|
|
|
433e38e |
class VersionTestCase(unittest.TestCase):
|
|
|
433e38e |
|
|
|
433e38e |
def test_library_version(self):
|
|
|
433e38e |
@@ -445,9 +459,8 @@ def test_flushes(self):
|
|
|
433e38e |
sync_opt = ['Z_NO_FLUSH', 'Z_SYNC_FLUSH', 'Z_FULL_FLUSH',
|
|
|
433e38e |
'Z_PARTIAL_FLUSH']
|
|
|
433e38e |
|
|
|
433e38e |
- ver = tuple(int(v) for v in zlib.ZLIB_RUNTIME_VERSION.split('.'))
|
|
|
433e38e |
# Z_BLOCK has a known failure prior to 1.2.5.3
|
|
|
433e38e |
- if ver >= (1, 2, 5, 3):
|
|
|
433e38e |
+ if ZLIB_RUNTIME_VERSION_TUPLE >= (1, 2, 5, 3):
|
|
|
433e38e |
sync_opt.append('Z_BLOCK')
|
|
|
433e38e |
|
|
|
433e38e |
sync_opt = [getattr(zlib, opt) for opt in sync_opt
|
|
|
433e38e |
@@ -776,16 +789,7 @@ def test_large_unconsumed_tail(self, size):
|
|
|
433e38e |
|
|
|
433e38e |
def test_wbits(self):
|
|
|
433e38e |
# wbits=0 only supported since zlib v1.2.3.5
|
|
|
433e38e |
- # Register "1.2.3" as "1.2.3.0"
|
|
|
433e38e |
- # or "1.2.0-linux","1.2.0.f","1.2.0.f-linux"
|
|
|
433e38e |
- v = zlib.ZLIB_RUNTIME_VERSION.split('-', 1)[0].split('.')
|
|
|
433e38e |
- if len(v) < 4:
|
|
|
433e38e |
- v.append('0')
|
|
|
433e38e |
- elif not v[-1].isnumeric():
|
|
|
433e38e |
- v[-1] = '0'
|
|
|
433e38e |
-
|
|
|
433e38e |
- v = tuple(map(int, v))
|
|
|
433e38e |
- supports_wbits_0 = v >= (1, 2, 3, 5)
|
|
|
433e38e |
+ supports_wbits_0 = ZLIB_RUNTIME_VERSION_TUPLE >= (1, 2, 3, 5)
|
|
|
433e38e |
|
|
|
433e38e |
co = zlib.compressobj(level=1, wbits=15)
|
|
|
433e38e |
zlib15 = co.compress(HAMLET_SCENE) + co.flush()
|