# HG changeset patch
# User Ian Moody <moz-ian@perix.co.uk>
# Date 2019-10-04 17:33:54
# Node ID 0f90c2d2d7e86e5af8906bf8a160b3d5c7bd9ee4
# Parent  e360acfaf210625e552cd3b4a14c169947898a3c

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

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

Differential Revision: https://phab.mercurial-scm.org/D6961

diff --git a/hgext/phabricator.py b/hgext/phabricator.py
--- a/hgext/phabricator.py
+++ b/hgext/phabricator.py
@@ -251,7 +251,8 @@ def callconduit(ui, name, params):
     parsed = pycompat.rapply(
         lambda x: encoding.unitolocal(x) if isinstance(x, pycompat.unicode)
         else x,
-        json.loads(body)
+        # json.loads only accepts bytes from py3.6+
+        json.loads(encoding.unifromlocal(body))
     )
     if parsed.get(b'error_code'):
         msg = (_(b'Conduit Error (%s): %s')