]> granicus.if.org Git - python/commitdiff
bpo-32682: Improve libz version parsing in test_zilb (GH-5347)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Mon, 19 Feb 2018 04:31:15 +0000 (20:31 -0800)
committerGitHub <noreply@github.com>
Mon, 19 Feb 2018 04:31:15 +0000 (20:31 -0800)
(cherry picked from commit 4c7108a77144493d0aa6fc0105b67d3797e143f5)

Co-authored-by: pmp-p <pmp-p@users.noreply.github.com>
Lib/test/test_zlib.py

index 20174d8343f2b554b7ebe1f241f4c0321ed2bce0..8e29b1bcebff38b328047f1e62d648cc4c146759 100644 (file)
@@ -751,10 +751,15 @@ class CompressObjectTestCase(BaseCompressTestCase, unittest.TestCase):
     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()