tfix deserialize_proxy. fixes #1309 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit f894af90d7b3f7d7623ef0e07461e5a7e4d2a4ab
DIR parent 74d26f5bdcfcd6ca49c00ad6345ab81ca50f8f99
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 23 Jun 2015 14:22:10 +0200
fix deserialize_proxy. fixes #1309
Diffstat:
M lib/network.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
DIR diff --git a/lib/network.py b/lib/network.py
t@@ -92,7 +92,7 @@ def serialize_proxy(p):
return ':'.join([p.get('mode'),p.get('host'), p.get('port')])
def deserialize_proxy(s):
- if type(s) != str:
+ if type(s) not in [str, unicode]:
return None
if s.lower() == 'none':
return None