This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7535

win32mbcs: fix a `str` type conditional for py3
ClosedPublic

Authored by mharbison72 on Nov 30 2019, 12:09 PM.

Details

Reviewers
dlax
pulkit
Group Reviewers
hg-reviewers
Commits
rHG66210a20f727: win32mbcs: fix a `str` type conditional for py3

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.

Event Timeline

mharbison72 created this revision.Nov 30 2019, 12:09 PM
dlax accepted this revision.Dec 1 2019, 4:52 AM
pulkit accepted this revision.Dec 2 2019, 10:06 AM
This revision is now accepted and ready to land.Dec 2 2019, 10:06 AM
mharbison72 added a commit: rHG66210a20f727: win32mbcs: fix a `str` type conditional for py3.Dec 2 2019, 4:55 PM
Closed by commit rHG66210a20f727: win32mbcs: fix a `str` type conditional for py3 (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 18428

hgext/win32mbcs.py

configitem( configitem(
b'win32mbcs', b'encoding', default=lambda: encoding.encoding, b'win32mbcs', b'encoding', default=lambda: encoding.encoding,
) )
_encoding = None # see extsetup _encoding = None # see extsetup
def decode(arg): def decode(arg):
if isinstance(arg, str): if isinstance(arg, bytes):
uarg = arg.decode(_encoding) uarg = arg.decode(_encoding)
if arg == uarg.encode(_encoding): if arg == uarg.encode(_encoding):
return uarg return uarg
raise UnicodeError(b"Not local encoding") raise UnicodeError(b"Not local encoding")
elif isinstance(arg, tuple): elif isinstance(arg, tuple):
return tuple(map(decode, arg)) return tuple(map(decode, arg))
elif isinstance(arg, list): elif isinstance(arg, list):
return map(decode, arg) return map(decode, arg)