git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
f41065c
)
Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 8 Sep 2011 17:07:24 +0000
(13:07 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 8 Sep 2011 17:07:24 +0000
(13:07 -0400)
sfa/util/xmlrpcprotocol.py
patch
|
blob
|
history
diff --git
a/sfa/util/xmlrpcprotocol.py
b/sfa/util/xmlrpcprotocol.py
index
1cdc605
..
25e7b76
100644
(file)
--- 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