This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7621

pycompat: allow pycompat.sysbytes() even if input already is bytes
ClosedPublic

Authored by martinvonz on Dec 12 2019, 6:44 PM.

Details

Reviewers
dlax
indygreg
Group Reviewers
hg-reviewers
Commits
rHG66af68d4c751: pycompat: allow pycompat.sysbytes() even if input already is bytes
Summary

pycompat.sysstr() on py3 accepts an input that's already str
(i.e. unicode). This patch makes it so pycompat.sysbytes() on py3
accepts an input that's already bytes. Allowing that makes it possible
to do pycompat.sysbytes(fp.name) where fp.name is either bytes or
unicode, as we'll get when fp can come from either open() or
resources.open_binary().

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/pycompat.py (2 lines)

Diff 18730

mercurial/pycompat.py

return s return s
def sysbytes(s): def sysbytes(s):
"""Convert an internal str (e.g. keyword, __doc__) back to bytes """Convert an internal str (e.g. keyword, __doc__) back to bytes
This never raises UnicodeEncodeError, but only ASCII characters This never raises UnicodeEncodeError, but only ASCII characters
can be round-trip by sysstr(sysbytes(s)). can be round-trip by sysstr(sysbytes(s)).
""" """
if isinstance(s, bytes):
return s
return s.encode('utf-8') return s.encode('utf-8')
def sysstr(s): def sysstr(s):
"""Return a keyword str to be passed to Python functions such as """Return a keyword str to be passed to Python functions such as
getattr() and str.encode() getattr() and str.encode()
This never raises UnicodeDecodeError. Non-ascii characters are This never raises UnicodeDecodeError. Non-ascii characters are
considered invalid and mapped to arbitrary but unique code points considered invalid and mapped to arbitrary but unique code points