electrum

commit db730dd1795bea7dec9572e7c0c8e0fd16210775
parent 5e76b8caab28fb353e0e42b175f4a1d94fa09607
Author: thomasv <thomasv@gitorious>
Date:   Fri, 12 Oct 2012 11:56:41 +0200

minor fix for proxy type

Diffstat:
M
lib/interface.py
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/interface.py b/lib/interface.py
@@ -298,7 +298,7 @@ class Interface(TcpStratumInterface, HttpStratumInterface):
             port = int(port)
 
         self.protocol = protocol
-        proxy = self.parse_proxy_options(config.get('proxy','none'))
+        proxy = self.parse_proxy_options(config.get('proxy'))
         self.server = host + ':%d:%s'%(port, protocol)
 
         #print protocol, host, port
@@ -325,6 +325,7 @@ class Interface(TcpStratumInterface, HttpStratumInterface):
 
 
     def parse_proxy_options(self, s):
+        if type(s) == type({}): return s  # fixme: type should be fixed
         if type(s) != type(""): return None  
         if s.lower() == 'none': return None
         proxy = { "mode":"socks5", "host":"localhost" }