Skip to content

bpo-32682: test_zlib improve version parsing #5347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 19, 2018
Merged

bpo-32682: test_zlib improve version parsing #5347

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c144513
issue 32682: test_zlib improve version parsing
pmp-p Jan 26, 2018
e88a712
simplify as requested
pmp-p Jan 26, 2018
a2a9571
Update test_zlib.py
pmp-p Jan 26, 2018
c6d42d6
Update test_zlib.py
pmp-p Jan 26, 2018
bcb3c78
Update test_zlib.py
pmp-p Jan 26, 2018
1c7d536
out of space
pmp-p Jan 26, 2018
8255937
Update test_zlib.py
pmp-p Feb 5, 2018
2e9307d
Update test_zlib.py
pmp-p Feb 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions Lib/test/test_zlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,12 +750,19 @@ 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))

# Register "1.2.3" as "1.2.3.0" 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 ) )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for the extra spaces around ( or ); v = tuple(map(int, v)). (See PEP 8.)

supports_wbits_0 = (v[0]> 1) or ( v[0] == 1 ) \
and ( v[1] > 2 ) or ( v[1] == 2 ) \
and ( v[2] > 3 ) or ( v[2] == 3) \
and ( v[3] >= 5)

co = zlib.compressobj(level=1, wbits=15)
zlib15 = co.compress(HAMLET_SCENE) + co.flush()
self.assertEqual(zlib.decompress(zlib15, 15), HAMLET_SCENE)
Expand Down