minor fix for proxy type
authorthomasv <thomasv@gitorious>
Fri, 12 Oct 2012 09:56:41 +0000 (11:56 +0200)
committerthomasv <thomasv@gitorious>
Fri, 12 Oct 2012 09:56:41 +0000 (11:56 +0200)
lib/interface.py

index 476c9e4..1f64278 100644 (file)
@@ -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" }