Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/ui.py @ 33860:7d5bc0e5b88f
py3: introduce a wrapper for __builtins__.{raw_,}input()
In order to make this work, we have to wrap the io streams in a
TextIOWrapper so that __builtins__.input() can do unicode IO on Python
3. We can't just restore the original (unicode) sys.std* because we
might be running a cmdserver, and if we blindly restore sys.* to the
original values then we end up breaking the cmdserver. Sadly,
TextIOWrapper tries to close the underlying stream during its __del__,
so we have to make a sublcass to prevent that.
If you see errors like:
TypeError: a bytes-like object is required, not 'str'
On an input() or print() call on Python 3, the substitution of
sys.std* is probably the root cause.
A previous version of this change tried to put the bytesinput() method
in pycompat - it turns out we need to do some encoding handling, so we
have to be in a higher layer that's allowed to use
mercurial.encoding.encoding. As a result, this is in util for now,
with the TextIOWrapper subclass hiding in encoding.py. I'm not sure of
a better place for the time being.
Differential Revision: https://phab.mercurial-scm.org/D299
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 24 Jul 2017 14:38:40 -0400 |
| parents | 86aca74a063b |
| children | af20468eb0a4 |
comparison
equal
deleted
inserted
replaced
| 33859:48f3e87ce650 | 33860:7d5bc0e5b88f |
|---|---|
| 1215 # call write() so output goes through subclassed implementation | 1215 # call write() so output goes through subclassed implementation |
| 1216 # e.g. color extension on Windows | 1216 # e.g. color extension on Windows |
| 1217 self.write(prompt, prompt=True) | 1217 self.write(prompt, prompt=True) |
| 1218 self.flush() | 1218 self.flush() |
| 1219 | 1219 |
| 1220 # instead of trying to emulate raw_input, swap (self.fin, | |
| 1221 # self.fout) with (sys.stdin, sys.stdout) | |
| 1222 oldin = sys.stdin | |
| 1223 oldout = sys.stdout | |
| 1224 sys.stdin = self.fin | |
| 1225 sys.stdout = self.fout | |
| 1226 # prompt ' ' must exist; otherwise readline may delete entire line | 1220 # prompt ' ' must exist; otherwise readline may delete entire line |
| 1227 # - http://bugs.python.org/issue12833 | 1221 # - http://bugs.python.org/issue12833 |
| 1228 with self.timeblockedsection('stdio'): | 1222 with self.timeblockedsection('stdio'): |
| 1229 line = raw_input(' ') | 1223 line = util.bytesinput(self.fin, self.fout, r' ') |
| 1230 sys.stdin = oldin | |
| 1231 sys.stdout = oldout | |
| 1232 | 1224 |
| 1233 # When stdin is in binary mode on Windows, it can cause | 1225 # When stdin is in binary mode on Windows, it can cause |
| 1234 # raw_input() to emit an extra trailing carriage return | 1226 # raw_input() to emit an extra trailing carriage return |
| 1235 if pycompat.oslinesep == '\r\n' and line and line[-1] == '\r': | 1227 if pycompat.oslinesep == '\r\n' and line and line[-1] == '\r': |
| 1236 line = line[:-1] | 1228 line = line[:-1] |