Mercurial > hg
diff hgext/convert/common.py @ 49288:ef5f5f1cbd90
py3: constant-fold some `pycompat.ispy3`
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Tue, 31 May 2022 00:50:29 +0200 |
parents | 642e31cb55f0 |
children | 2e726c934fcd |
line wrap: on
line diff
--- a/hgext/convert/common.py Sun May 29 15:38:01 2022 +0200 +++ b/hgext/convert/common.py Tue May 31 00:50:29 2022 +0200 @@ -55,45 +55,25 @@ def shlexer(data=None, filepath=None, wordchars=None, whitespace=None): if data is None: - if pycompat.ispy3: - data = open(filepath, b'r', encoding='latin1') - else: - data = open(filepath, b'r') + data = open(filepath, b'r', encoding='latin1') else: if filepath is not None: raise error.ProgrammingError( b'shlexer only accepts data or filepath, not both' ) - if pycompat.ispy3: - data = data.decode('latin1') + data = data.decode('latin1') l = shlex.shlex(data, infile=filepath, posix=True) if whitespace is not None: l.whitespace_split = True - if pycompat.ispy3: - l.whitespace += whitespace.decode('latin1') - else: - l.whitespace += whitespace + l.whitespace += whitespace.decode('latin1') if wordchars is not None: - if pycompat.ispy3: - l.wordchars += wordchars.decode('latin1') - else: - l.wordchars += wordchars - if pycompat.ispy3: - return _shlexpy3proxy(l) - return l - - -if pycompat.ispy3: - base64_encodebytes = base64.encodebytes - base64_decodebytes = base64.decodebytes -else: - base64_encodebytes = base64.encodestring - base64_decodebytes = base64.decodestring + l.wordchars += wordchars.decode('latin1') + return _shlexpy3proxy(l) def encodeargs(args): def encodearg(s): - lines = base64_encodebytes(s) + lines = base64.encodebytes(s) lines = [l.splitlines()[0] for l in pycompat.iterbytestr(lines)] return b''.join(lines) @@ -102,7 +82,7 @@ def decodeargs(s): - s = base64_decodebytes(s) + s = base64.decodebytes(s) return pickle.loads(s)