( )⚙ D12364 pycompat: remove json.loads polyfill for Python 3.5

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12364

pycompat: remove json.loads polyfill for Python 3.5
ClosedPublic

Authored by indygreg on Mar 9 2022, 8:07 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc3a48dd506da: pycompat: remove json.loads polyfill for Python 3.5
Summary

We no longer support Python 3.5 so this can be deleted.

Diff Detail

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

Event Timeline

indygreg created this revision.Mar 9 2022, 8:07 PM
Alphare accepted this revision.Mar 14 2022, 6:09 AM
This revision is now accepted and ready to land.Mar 14 2022, 6:09 AM
indygreg added a commit: rHGc3a48dd506da: pycompat: remove json.loads polyfill for Python 3.5.Mar 14 2022, 6:48 AM
Closed by commit rHGc3a48dd506da: pycompat: remove json.loads polyfill for Python 3.5 (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pycompat.py (42 lines)

Diff 32618

mercurial/pycompat.py

""" """
ret = shlex.split(s.decode('latin-1'), comments, posix) ret = shlex.split(s.decode('latin-1'), comments, posix)
return [a.encode('latin-1') for a in ret] return [a.encode('latin-1') for a in ret]
iteritems = lambda x: x.items() iteritems = lambda x: x.items()
itervalues = lambda x: x.values() itervalues = lambda x: x.values()
# Python 3.5's json.load and json.loads require str. We polyfill its
# code for detecting encoding from bytes.
if sys.version_info[0:2] < (3, 6):
def _detect_encoding(b):
bstartswith = b.startswith
if bstartswith((codecs.BOM_UTF32_BE, codecs.BOM_UTF32_LE)):
return 'utf-32'
if bstartswith((codecs.BOM_UTF16_BE, codecs.BOM_UTF16_LE)):
return 'utf-16'
if bstartswith(codecs.BOM_UTF8):
return 'utf-8-sig'
if len(b) >= 4:
if not b[0]:
# 00 00 -- -- - utf-32-be
# 00 XX -- -- - utf-16-be
return 'utf-16-be' if b[1] else 'utf-32-be'
if not b[1]:
# XX 00 00 00 - utf-32-le
# XX 00 00 XX - utf-16-le
# XX 00 XX -- - utf-16-le
return 'utf-16-le' if b[2] or b[3] else 'utf-32-le'
elif len(b) == 2:
if not b[0]:
# 00 XX - utf-16-be
return 'utf-16-be'
if not b[1]:
# XX 00 - utf-16-le
return 'utf-16-le'
# default
return 'utf-8'
def json_loads(s, *args, **kwargs):
if isinstance(s, (bytes, bytearray)):
s = s.decode(_detect_encoding(s), 'surrogatepass')
return json.loads(s, *args, **kwargs)
else:
json_loads = json.loads json_loads = json.loads
isjython = sysplatform.startswith(b'java') isjython = sysplatform.startswith(b'java')
isdarwin = sysplatform.startswith(b'darwin') isdarwin = sysplatform.startswith(b'darwin')
islinux = sysplatform.startswith(b'linux') islinux = sysplatform.startswith(b'linux')
isposix = osname == b'posix' isposix = osname == b'posix'
iswindows = osname == b'nt' iswindows = osname == b'nt'