diff -r a8d540d2628c -r 644a02f6b34f mercurial/pycompat.py --- a/mercurial/pycompat.py Wed Mar 14 14:05:45 2018 -0400 +++ b/mercurial/pycompat.py Wed Mar 14 11:52:35 2018 -0700 @@ -64,7 +64,9 @@ sysexecutable = sys.executable if sysexecutable: sysexecutable = os.fsencode(sysexecutable) - stringio = io.BytesIO + bytesio = io.BytesIO + # TODO deprecate stringio name, as it is a lie on Python 3. + stringio = bytesio def maplist(*args): return list(map(*args)) @@ -343,7 +345,8 @@ getcwd = os.getcwd sysexecutable = sys.executable shlexsplit = shlex.split - stringio = cStringIO.StringIO + bytesio = cStringIO.StringIO + stringio = bytesio maplist = map ziplist = zip rawinput = raw_input