hgext/phabricator.py
changeset 43047 0f90c2d2d7e8
parent 42973 24bf7a3d3c30
child 43076 2372284d9457
--- a/hgext/phabricator.py	Fri Oct 04 18:18:38 2019 +0100
+++ b/hgext/phabricator.py	Fri Oct 04 18:33:54 2019 +0100
@@ -251,7 +251,8 @@
     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')