diff -r a89dd6d01df0 -r 8a42aa04ef36 tests/test-debugcommands.t
--- a/tests/test-debugcommands.t	Thu Sep 27 16:55:06 2018 +0200
+++ b/tests/test-debugcommands.t	Fri Sep 28 22:39:18 2018 -0400
@@ -532,29 +532,31 @@
 
   $ cat > debugstacktrace.py << EOF
   > from __future__ import absolute_import
-  > import sys
-  > from mercurial import util
+  > from mercurial import (
+  >     pycompat,
+  >     util,
+  > )
   > def f():
-  >     util.debugstacktrace(f=sys.stdout)
+  >     util.debugstacktrace(f=pycompat.stdout)
   >     g()
   > def g():
-  >     util.dst('hello from g\\n', skip=1)
+  >     util.dst(b'hello from g\\n', skip=1)
   >     h()
   > def h():
-  >     util.dst('hi ...\\nfrom h hidden in g', 1, depth=2)
+  >     util.dst(b'hi ...\\nfrom h hidden in g', 1, depth=2)
   > f()
   > EOF
   $ "$PYTHON" debugstacktrace.py
   stacktrace at:
-   debugstacktrace.py:12 in * (glob)
-   debugstacktrace.py:5  in f
+   debugstacktrace.py:14 in * (glob)
+   debugstacktrace.py:7  in f
   hello from g at:
-   debugstacktrace.py:12 in * (glob)
-   debugstacktrace.py:6  in f
+   debugstacktrace.py:14 in * (glob)
+   debugstacktrace.py:8  in f
   hi ...
   from h hidden in g at:
-   debugstacktrace.py:6 in f
-   debugstacktrace.py:9 in g
+   debugstacktrace.py:8  in f
+   debugstacktrace.py:11 in g
 
 Test debugcapabilities command: