From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Mon, 8 Aug 2011 13:01:19 +0000 (-0400)
Subject: completely disable timeout bugfix code to see if build passes
X-Git-Tag: sfa-1.0-30~7
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cf532e7906da402eeeb53b507e34ead711174267;p=sfa.git

completely disable timeout bugfix code to see if build passes
---

diff --git a/sfa/util/xmlrpcprotocol.py b/sfa/util/xmlrpcprotocol.py
index 6bab4c63..81f3a3d5 100644
--- 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