Mercurial > public > mercurial-scm > hg-stable

diff mercurial/ui.py @ 36799:30742c216abb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: inline util.bytesinput() into ui._readline() Prepares for rework of Python 3 support, which is currently broken due to read-ahead buffer of TextIOWrapper.
author Yuya Nishihara <yuya@tcha.org>
date Tue, 06 Mar 2018 02:14:11 -0600
parents e3732c3ab92d
children fa53a1d1f16e
line wrap: on
line diff
--- a/mercurial/ui.py	Tue Mar 06 02:05:25 2018 -0600
+++ b/mercurial/ui.py	Tue Mar 06 02:14:11 2018 -0600
@@ -1278,7 +1278,13 @@
         # prompt ' ' must exist; otherwise readline may delete entire line
         # - http://bugs.python.org/issue12833
         with self.timeblockedsection('stdio'):
-            line = util.bytesinput(self.fin, self.fout, r' ')
+            sin, sout = sys.stdin, sys.stdout
+            try:
+                sys.stdin = encoding.strio(self.fin)
+                sys.stdout = encoding.strio(self.fout)
+                line = encoding.strtolocal(pycompat.rawinput(r' '))
+            finally:
+                sys.stdin, sys.stdout = sin, sout
 
         # When stdin is in binary mode on Windows, it can cause
         # raw_input() to emit an extra trailing carriage return