electrum

commit cfce1420c5dbf62a40977f6db841398e13b52e68
parent fd13d19cb86eded4e386ea127a76c9736c150219
Author: thomasv <thomasv@gitorious>
Date:   Tue,  9 Oct 2012 16:16:00 +0200

proxy: allow '-p none'

Diffstat:
M
lib/interface.py
 | 
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/lib/interface.py b/lib/interface.py
@@ -48,6 +48,7 @@ def old_to_new(d):
     replace_keys(d, 'raw_scriptPubKey', 'raw_output_script')
 
 def parse_proxy_options(s):
+    if s.lower() == 'none': return None
     proxy = { "mode":"socks5", "host":"localhost" }
     args = s.split(':')
     n = 0