Mercurial > public > mercurial-scm > hg-stable
diff mercurial/ui.py @ 15067:cc16323e748d
merge with stable
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Tue, 30 Aug 2011 15:22:10 +0200 |
parents | 7c03e3b1b858 0fc95f5cea57 |
children | bfe903b1ff4e |
line wrap: on
line diff
--- a/mercurial/ui.py Fri Aug 26 16:08:24 2011 -0500 +++ b/mercurial/ui.py Tue Aug 30 15:22:10 2011 +0200 @@ -555,11 +555,15 @@ # e.g. color extension on Windows self.write(prompt) - # instead of trying to emulate raw_input, swap self.fin with sys.stdin - old = sys.stdin + # instead of trying to emulate raw_input, swap (self.fin, + # self.fout) with (sys.stdin, sys.stdout) + oldin = sys.stdin + oldout = sys.stdout sys.stdin = self.fin + sys.stdout = self.fout line = raw_input(' ') - sys.stdin = old + sys.stdin = oldin + sys.stdout = oldout # When stdin is in binary mode on Windows, it can cause # raw_input() to emit an extra trailing carriage return