( )⚙ D12310 charencode: remove Python 2 support code

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12310

charencode: remove Python 2 support code
ClosedPublic

Authored by indygreg on Mar 2 2022, 6:31 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGb677bccf74b9: charencode: remove Python 2 support code

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg created this revision.Mar 2 2022, 6:31 PM
Alphare accepted this revision.Mar 3 2022, 5:42 AM
This revision is now accepted and ready to land.Mar 3 2022, 5:42 AM
indygreg added a commit: rHGb677bccf74b9: charencode: remove Python 2 support code.Mar 3 2022, 11:56 AM
Closed by commit rHGb677bccf74b9: charencode: remove Python 2 support code (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/charencode.py (5 lines)

Diff 32435

mercurial/pure/charencode.py

else: else:
jm = _jsonmap jm = _jsonmap
try: try:
return b''.join(jm[x] for x in bytearray(u8chars)) return b''.join(jm[x] for x in bytearray(u8chars))
except IndexError: except IndexError:
raise ValueError raise ValueError
if pycompat.ispy3:
_utf8strict = r'surrogatepass' _utf8strict = r'surrogatepass'
else:
_utf8strict = r'strict'
def jsonescapeu8fallback(u8chars, paranoid): def jsonescapeu8fallback(u8chars, paranoid):
"""Convert a UTF-8 byte string to JSON-escaped form (slow path) """Convert a UTF-8 byte string to JSON-escaped form (slow path)
Escapes all non-ASCII characters no matter if paranoid is False. Escapes all non-ASCII characters no matter if paranoid is False.
""" """
if paranoid: if paranoid:
jm = _paranoidjsonmap jm = _paranoidjsonmap
else: else:
jm = _jsonmap jm = _jsonmap
# non-BMP char is represented as UTF-16 surrogate pair # non-BMP char is represented as UTF-16 surrogate pair
u16b = u8chars.decode('utf-8', _utf8strict).encode('utf-16', _utf8strict) u16b = u8chars.decode('utf-8', _utf8strict).encode('utf-16', _utf8strict)
u16codes = array.array('H', u16b) u16codes = array.array('H', u16b)
u16codes.pop(0) # drop BOM u16codes.pop(0) # drop BOM
return b''.join(jm[x] if x < 128 else b'\\u%04x' % x for x in u16codes) return b''.join(jm[x] if x < 128 else b'\\u%04x' % x for x in u16codes)