[Python-checkins] bpo-32682: Improve libz version parsing in test_zilb (GH-5347)
Miss Islington (bot)
webhook-mailer at python.org
Sun Feb 18 23:10:02 EST 2018
https://github.com/python/cpython/commit/0cd35817e8278588f04dc574f6eca53273799f25
commit: 0cd35817e8278588f04dc574f6eca53273799f25
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-02-18T20:09:59-08:00
summary:
bpo-32682: Improve libz version parsing in test_zilb (GH-5347)
(cherry picked from commit 4c7108a77144493d0aa6fc0105b67d3797e143f5)
Co-authored-by: pmp-p <pmp-p at users.noreply.github.com>
files:
M Lib/test/test_zlib.py
diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
index e67bee97cb3d..db950fc1907a 100644
--- a/Lib/test/test_zlib.py
+++ b/Lib/test/test_zlib.py
@@ -751,10 +751,15 @@ def test_large_unconsumed_tail(self, size):
def test_wbits(self):
# wbits=0 only supported since zlib v1.2.3.5
# Register "1.2.3" as "1.2.3.0"
- v = (zlib.ZLIB_RUNTIME_VERSION + ".0").split(".", 4)
- supports_wbits_0 = int(v[0]) > 1 or int(v[0]) == 1 \
- and (int(v[1]) > 2 or int(v[1]) == 2
- and (int(v[2]) > 3 or int(v[2]) == 3 and int(v[3]) >= 5))
+ # or "1.2.0-linux","1.2.0.f","1.2.0.f-linux"
+ v = zlib.ZLIB_RUNTIME_VERSION.split('-', 1)[0].split('.')
+ if len(v) < 4:
+ v.append('0')
+ elif not v[-1].isnumeric():
+ v[-1] = '0'
+
+ v = tuple(map(int, v))
+ supports_wbits_0 = v >= (1, 2, 3, 5)
co = zlib.compressobj(level=1, wbits=15)
zlib15 = co.compress(HAMLET_SCENE) + co.flush()
More information about the Python-checkins
mailing list