# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1519944992 18000
# Node ID 3696efeab66f81dcdae9fb2548411003b51eb063
# Parent  086fc71fbb09c7d9613f9974c318574462803cb1
py3: don't crash when re-raising encoding error

diff -r 086fc71fbb09 -r 3696efeab66f mercurial/encoding.py
--- a/mercurial/encoding.py	Thu Mar 01 17:43:25 2018 -0500
+++ b/mercurial/encoding.py	Thu Mar 01 17:56:32 2018 -0500
@@ -181,7 +181,8 @@
         return u.encode("utf-8")
     except UnicodeDecodeError as inst:
         sub = s[max(0, inst.start - 10):inst.start + 10]
-        raise error.Abort("decoding near '%s': %s!" % (sub, inst))
+        raise error.Abort("decoding near '%s': %s!"
+                          % (sub, pycompat.bytestr(inst)))
     except LookupError as k:
         raise error.Abort(k, hint="please check your locale settings")