This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7379

encoding: fix bad type annotation
ClosedPublic

Authored by durin42 on Nov 13 2019, 10:50 PM.

Details

Reviewers
dlax
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHG7edc07fb890c: encoding: fix bad type annotation
Summary

This function returns utf-8 in a bytes, not a unicode.

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/encoding.py (2 lines)

Diff 18117

mercurial/encoding.py

u = s.decode("utf-8", "replace") # last ditch u = s.decode("utf-8", "replace") # last ditch
# can't round-trip # can't round-trip
return u.encode(_sysstr(encoding), "replace") return u.encode(_sysstr(encoding), "replace")
except LookupError as k: except LookupError as k:
raise error.Abort(k, hint=b"please check your locale settings") raise error.Abort(k, hint=b"please check your locale settings")
def fromlocal(s): def fromlocal(s):
# type: (bytes) -> Text # type: (bytes) -> bytes
""" """
Convert a string from the local character encoding to UTF-8 Convert a string from the local character encoding to UTF-8
We attempt to decode strings using the encoding mode set by We attempt to decode strings using the encoding mode set by
HGENCODINGMODE, which defaults to 'strict'. In this mode, unknown HGENCODINGMODE, which defaults to 'strict'. In this mode, unknown
characters will cause an error message. Other modes include characters will cause an error message. Other modes include
'replace', which replaces unknown characters with a special 'replace', which replaces unknown characters with a special
Unicode character, and 'ignore', which drops the character. Unicode character, and 'ignore', which drops the character.