Skip to content

Commit eae6a29

Browse files
hroncokhrnciar
authored andcommitted
00419: pythongh-112769: test_zlib: Fix comparison of ZLIB_RUNTIME_VERSION with non-int suffix (pythonGH-112771) (pythonGH-112774)
zlib-ng defines the version as "1.3.0.zlib-ng". (cherry picked from commit d384813)
1 parent a4ac15a commit eae6a29

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

Lib/test/test_zlib.py

+16-12
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,20 @@
1717
'requires Decompress.copy()')
1818

1919

20+
def _zlib_runtime_version_tuple(zlib_version=zlib.ZLIB_RUNTIME_VERSION):
21+
# Register "1.2.3" as "1.2.3.0"
22+
# or "1.2.0-linux","1.2.0.f","1.2.0.f-linux"
23+
v = zlib_version.split('-', 1)[0].split('.')
24+
if len(v) < 4:
25+
v.append('0')
26+
elif not v[-1].isnumeric():
27+
v[-1] = '0'
28+
return tuple(map(int, v))
29+
30+
31+
ZLIB_RUNTIME_VERSION_TUPLE = _zlib_runtime_version_tuple()
32+
33+
2034
class VersionTestCase(unittest.TestCase):
2135

2236
def test_library_version(self):
@@ -438,9 +452,8 @@ def test_flushes(self):
438452
sync_opt = ['Z_NO_FLUSH', 'Z_SYNC_FLUSH', 'Z_FULL_FLUSH',
439453
'Z_PARTIAL_FLUSH']
440454

441-
ver = tuple(int(v) for v in zlib.ZLIB_RUNTIME_VERSION.split('.'))
442455
# Z_BLOCK has a known failure prior to 1.2.5.3
443-
if ver >= (1, 2, 5, 3):
456+
if ZLIB_RUNTIME_VERSION_TUPLE >= (1, 2, 5, 3):
444457
sync_opt.append('Z_BLOCK')
445458

446459
sync_opt = [getattr(zlib, opt) for opt in sync_opt
@@ -769,16 +782,7 @@ def test_large_unconsumed_tail(self, size):
769782

770783
def test_wbits(self):
771784
# wbits=0 only supported since zlib v1.2.3.5
772-
# Register "1.2.3" as "1.2.3.0"
773-
# or "1.2.0-linux","1.2.0.f","1.2.0.f-linux"
774-
v = zlib.ZLIB_RUNTIME_VERSION.split('-', 1)[0].split('.')
775-
if len(v) < 4:
776-
v.append('0')
777-
elif not v[-1].isnumeric():
778-
v[-1] = '0'
779-
780-
v = tuple(map(int, v))
781-
supports_wbits_0 = v >= (1, 2, 3, 5)
785+
supports_wbits_0 = ZLIB_RUNTIME_VERSION_TUPLE >= (1, 2, 3, 5)
782786

783787
co = zlib.compressobj(level=1, wbits=15)
784788
zlib15 = co.compress(HAMLET_SCENE) + co.flush()

0 commit comments

Comments
 (0)