diff -r d4a2e0d5d042 -r a8a902d7176e tests/test-annotate.t
--- a/tests/test-annotate.t	Sat Mar 24 15:09:33 2018 +0900
+++ b/tests/test-annotate.t	Sat Mar 24 15:10:51 2018 +0900
@@ -910,9 +910,9 @@
 
   $ cat <<'EOF' >> "$TESTTMP/substcr.py"
   > import sys
-  > from mercurial import util
-  > util.setbinary(sys.stdin)
-  > util.setbinary(sys.stdout)
+  > from mercurial.utils import procutil
+  > procutil.setbinary(sys.stdin)
+  > procutil.setbinary(sys.stdout)
   > stdin = getattr(sys.stdin, 'buffer', sys.stdin)
   > stdout = getattr(sys.stdout, 'buffer', sys.stdout)
   > stdout.write(stdin.read().replace(b'\r', b'[CR]'))