This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6961

py3: fix phabricator's use of json.loads() for py3.5
ClosedPublic

Authored by Kwan on Oct 4 2019, 1:38 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG0f90c2d2d7e8: py3: fix phabricator's use of json.loads() for py3.5
Summary

Missed this in c340a8ac7ef3 since loads() takes bytes from 3.6 onwards.

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

Kwan created this revision.Oct 4 2019, 1:38 PM
Kwan added a commit: rHG0f90c2d2d7e8: py3: fix phabricator's use of json.loads() for py3.5.Oct 4 2019, 1:59 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG0f90c2d2d7e8: py3: fix phabricator's use of json.loads() for py3.5 (authored by Kwan). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (3 lines)

Diff 16801

hgext/phabricator.py

urlopener = urlmod.opener(ui, authinfo) urlopener = urlmod.opener(ui, authinfo)
request = util.urlreq.request(pycompat.strurl(url), data=data) request = util.urlreq.request(pycompat.strurl(url), data=data)
with contextlib.closing(urlopener.open(request)) as rsp: with contextlib.closing(urlopener.open(request)) as rsp:
body = rsp.read() body = rsp.read()
ui.debug(b'Conduit Response: %s\n' % body) ui.debug(b'Conduit Response: %s\n' % body)
parsed = pycompat.rapply( parsed = pycompat.rapply(
lambda x: encoding.unitolocal(x) if isinstance(x, pycompat.unicode) lambda x: encoding.unitolocal(x) if isinstance(x, pycompat.unicode)
else x, else x,
json.loads(body) # json.loads only accepts bytes from py3.6+
json.loads(encoding.unifromlocal(body))
) )
if parsed.get(b'error_code'): if parsed.get(b'error_code'):
msg = (_(b'Conduit Error (%s): %s') msg = (_(b'Conduit Error (%s): %s')
% (parsed[b'error_code'], parsed[b'error_info'])) % (parsed[b'error_code'], parsed[b'error_info']))
raise error.Abort(msg) raise error.Abort(msg)
return parsed[b'result'] return parsed[b'result']
@vcrcommand(b'debugcallconduit', [], _(b'METHOD'), optionalrepo=True) @vcrcommand(b'debugcallconduit', [], _(b'METHOD'), optionalrepo=True)