tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 1fb7556f9274f3e502bb5273153d170736b3718a
DIR parent ec039324545562664c6bc1ac6b583b3111da0255
HTML Author: ThomasV <thomasv@gitorious>
Date: Mon, 7 Oct 2013 22:39:02 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M electrum | 5 -----
M lib/util.py | 10 +++++++++-
2 files changed, 9 insertions(+), 6 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -166,11 +166,6 @@ if __name__ == '__main__':
time.sleep(0.1)
sys.exit(0)
- # Python bug (http://bugs.python.org/issue1927) causes raw_input
- # to be redirected improperly between stdin/stderr on Unix systems
- # if readline is not initialised first.
- import readline
-
if cmd not in known_commands:
cmd = 'help'
DIR diff --git a/lib/util.py b/lib/util.py
t@@ -179,4 +179,12 @@ def parse_url(url):
return address, amount, label, message, signature, identity, url
-
+# Python bug (http://bugs.python.org/issue1927) causes raw_input
+# to be redirected improperly between stdin/stderr on Unix systems
+def raw_input(prompt=None):
+ if prompt:
+ sys.stdout.write(prompt)
+ return builtin_raw_input()
+import __builtin__
+builtin_raw_input = __builtin__.raw_input
+__builtin__.raw_input = raw_input