From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 8 Sep 2011 17:07:24 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
X-Git-Tag: sfa-1.0-36~15^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=15b8387220751ffedd9a016b404b894d75bae598;hp=f41065c922fce4048eb2491fb612482c191e2905;p=sfa.git

Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
---

diff --git a/sfa/util/xmlrpcprotocol.py b/sfa/util/xmlrpcprotocol.py
index 1cdc6058..25e7b76d 100644
--- a/sfa/util/xmlrpcprotocol.py
+++ b/sfa/util/xmlrpcprotocol.py
@@ -67,7 +67,7 @@ class XMLRPCTransport(xmlrpclib.Transport):
                 real_conn = conn
             conn.connect()
             if hasattr(real_conn, "sock") and hasattr(real_conn.sock, "settimeout"):
-                real_conn.sock.settimeout(self.timeout)
+                real_conn.sock.settimeout(float(self.timeout))
 
         return conn