Mercurial > public > mercurial-scm > hg-stable
diff tests/hghave.py @ 44468:55c443fcb4fc
tests: rename _bytespath() to _sys2bytes() and _strpath() to _sys2str()
The names were not general enough because e.g. _strpath() was used for
converting IP addresses.
| author | Manuel Jacob <me@manueljacob.de> |
|---|---|
| date | Fri, 06 Mar 2020 09:50:57 +0100 |
| parents | e48a996d12bc |
| children | e397c6d74652 |
line wrap: on
line diff
--- a/tests/hghave.py Thu Mar 05 18:19:21 2020 +0100 +++ b/tests/hghave.py Fri Mar 06 09:50:57 2020 +0100 @@ -29,12 +29,12 @@ if sys.version_info[0] >= 3: - def _bytespath(p): + def _sys2bytes(p): if p is None: return p return p.encode('utf-8') - def _strpath(p): + def _bytes2sys(p): if p is None: return p return p.decode('utf-8') @@ -42,10 +42,10 @@ else: - def _bytespath(p): + def _sys2bytes(p): return p - _strpath = _bytespath + _bytes2sys = _sys2bytes def check(name, desc): @@ -461,7 +461,7 @@ os.close(fh) name = tempfile.mktemp(dir='.', prefix=tempprefix) try: - util.oslink(_bytespath(fn), _bytespath(name)) + util.oslink(_sys2bytes(fn), _sys2bytes(name)) os.unlink(name) return True except OSError: @@ -1032,7 +1032,7 @@ version_regex = b'black, version ([0-9a-b.]+)' version = matchoutput(blackcmd, version_regex) sv = distutils.version.StrictVersion - return version and sv(_strpath(version.group(1))) >= sv('19.10b0') + return version and sv(_bytes2sys(version.group(1))) >= sv('19.10b0') @check('pytype', 'the pytype type checker') @@ -1040,7 +1040,7 @@ pytypecmd = 'pytype --version' version = matchoutput(pytypecmd, b'[0-9a-b.]+') sv = distutils.version.StrictVersion - return version and sv(_strpath(version.group(0))) >= sv('2019.10.17') + return version and sv(_bytes2sys(version.group(0))) >= sv('2019.10.17') @check("rustfmt", "rustfmt tool")