Mercurial > hg-stable

changeset 39722:030d558c6456

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: add a missing b'' for Windows I tried ./contrib/byteify-strings.py, but there were way too many changes (and most looked wrong). This was hit with test-check-interfaces.py. # skip-blame for b'' prefixes
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 18 Sep 2018 22:40:03 -0400
parents fa681452b249
children 5abc47d4ca6b
files tests/run-tests.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/run-tests.py	Mon Sep 03 21:01:47 2018 +0900
+++ b/tests/run-tests.py	Tue Sep 18 22:40:03 2018 -0400
@@ -1153,7 +1153,7 @@
             killdaemons(env['DAEMON_PIDS'])
             return ret
 
-        output = ''
+        output = b''
         proc.tochild.close()
 
         try:
@@ -1177,7 +1177,7 @@
             output = re.sub(s, r, output)
 
         if normalizenewlines:
-            output = output.replace('\r\n', '\n')
+            output = output.replace(b'\r\n', b'\n')
 
         return ret, output.splitlines(True)