This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7219

hghave: decode black's version before passing to StrictVersion
AbandonedPublic

Authored by Kwan on Nov 4 2019, 2:12 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Summary

StrictVersion doesn't accept bytes, so test-hghave.t was dying with
"cannot use a string pattern on a bytes-like object".

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Kwan created this revision.Nov 4 2019, 2:12 PM
durin42 added a subscriber: durin42.Nov 4 2019, 4:21 PM

This is subtlely wrong on Python 2, and I think D7221 is a correct fix.

(I'd previously mailed that patch, but mail is backlogged.)

durin42 requested changes to this revision.Nov 4 2019, 4:21 PM
This revision now requires changes to proceed.Nov 4 2019, 4:21 PM
Kwan abandoned this revision.Nov 4 2019, 4:35 PM

Drop in favour of D7221.

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (2 lines)

Diff 17534

tests/hghave.py

@check('black', 'the black formatter for python') @check('black', 'the black formatter for python')
def has_black(): def has_black():
blackcmd = 'black --version' blackcmd = 'black --version'
version_regex = b'black, version ([0-9a-b.]+)' version_regex = b'black, version ([0-9a-b.]+)'
version = matchoutput(blackcmd, version_regex) version = matchoutput(blackcmd, version_regex)
sv = distutils.version.StrictVersion sv = distutils.version.StrictVersion
return version and sv(version.group(1)) >= sv('19.10b0') return version and sv(version.group(1).decode()) >= sv('19.10b0')