equal
deleted
inserted
replaced
249 body = rsp.read() |
249 body = rsp.read() |
250 ui.debug(b'Conduit Response: %s\n' % body) |
250 ui.debug(b'Conduit Response: %s\n' % body) |
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') |
258 % (parsed[b'error_code'], parsed[b'error_info'])) |
259 % (parsed[b'error_code'], parsed[b'error_info'])) |
259 raise error.Abort(msg) |
260 raise error.Abort(msg) |