From f894af90d7b3f7d7623ef0e07461e5a7e4d2a4ab Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Tue, 23 Jun 2015 14:22:10 +0200
Subject: [PATCH] fix deserialize_proxy. fixes #1309

---
 lib/network.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/network.py b/lib/network.py
index 71b92090..e8ca8c7a 100644
--- a/lib/network.py
+++ b/lib/network.py
@@ -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