git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
10d6981
)
completely disable timeout bugfix code to see if build passes
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 8 Aug 2011 13:01:19 +0000
(09:01 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 8 Aug 2011 13:01:19 +0000
(09:01 -0400)
sfa/util/xmlrpcprotocol.py
patch
|
blob
|
history
diff --git
a/sfa/util/xmlrpcprotocol.py
b/sfa/util/xmlrpcprotocol.py
index
6bab4c6
..
81f3a3d
100644
(file)
--- a/
sfa/util/xmlrpcprotocol.py
+++ b/
sfa/util/xmlrpcprotocol.py
@@
-1,8
+1,8
@@
# XMLRPC-specific code for SFA Client
import xmlrpclib
-from sfa.util.httpsProtocol import HTTPS, HTTPSConnection
-
+
#
from sfa.util.httpsProtocol import HTTPS, HTTPSConnection
+from httplib import HTTPS, HTTPSConnection
from sfa.util.sfalogging import logger
##
# ServerException, ExceptionUnmarshaller