##// END OF EJS Templates
py3: fix phabricator's use of json.loads() for py3.5...
Ian Moody -
r43317:0f90c2d2 default
parent child Browse files
Show More
@@ -251,7 +251,8 b' def callconduit(ui, name, params):'
251 parsed = pycompat.rapply(
251 parsed = pycompat.rapply(
252 lambda x: encoding.unitolocal(x) if isinstance(x, pycompat.unicode)
252 lambda x: encoding.unitolocal(x) if isinstance(x, pycompat.unicode)
253 else x,
253 else x,
254 json.loads(body)
254 # json.loads only accepts bytes from py3.6+
255 json.loads(encoding.unifromlocal(body))
255 )
256 )
256 if parsed.get(b'error_code'):
257 if parsed.get(b'error_code'):
257 msg = (_(b'Conduit Error (%s): %s')
258 msg = (_(b'Conduit Error (%s): %s')
General Comments 0
You need to be logged in to leave comments. Login now