# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 2018-10-16 06:41:58
# Node ID b7de186efd82df174dd11d4a2ce1a19a72a3c074
# Parent  dee73a97e1321d129852d51a1a9b3ced6ced17ef

py3: don't use traceback.print_exc() in commandserver.py

It doesn't support a bytes stream on Python 3. This makes a traceback being
sent by one frame, but that shouldn't matter.

diff --git a/mercurial/commandserver.py b/mercurial/commandserver.py
--- a/mercurial/commandserver.py
+++ b/mercurial/commandserver.py
@@ -369,7 +369,7 @@ def _serverequest(ui, repo, conn, create
             cerr = sv.cerr
         else:
             cerr = channeledoutput(fout, 'e')
-        traceback.print_exc(file=cerr)
+        cerr.write(encoding.strtolocal(traceback.format_exc()))
         raise
     finally:
         fin.close()
diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t
--- a/tests/test-commandserver.t
+++ b/tests/test-commandserver.t
@@ -786,8 +786,9 @@ unix domain socket:
   ...     while True:
   ...         try:
   ...             ch, data = readchannel(conn)
-  ...             if not data.startswith(b'  '):
-  ...                 bprint(b'%c, %r' % (ch, data))
+  ...             for l in data.splitlines(True):
+  ...                 if not l.startswith(b'  '):
+  ...                     bprint(b'%c, %r' % (ch, l))
   ...         except EOFError:
   ...             break
   >>> check(earlycrash, server.connect)