From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 16 Dec 2010 22:48:05 +0000 (+0100)
Subject: undo attempts made for python-2.7 as they're broken
X-Git-Tag: sfa-1.0-11~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=92b61f3e514e4831a19b60ce95143ded82e1db6e;p=sfa.git

undo attempts made for python-2.7 as they're broken
---

diff --git a/sfa/util/xmlrpcprotocol.py b/sfa/util/xmlrpcprotocol.py
index cf15bb88..67d6d626 100644
--- a/sfa/util/xmlrpcprotocol.py
+++ b/sfa/util/xmlrpcprotocol.py
@@ -34,13 +34,17 @@ class XMLRPCTransport(xmlrpclib.Transport):
         import httplib
         host, extra_headers, x509 = self.get_host_info(host)
         try:
-            HTTPS = httplib.HTTPSConnection(host, None)
+            HTTPS = httplib.HTTPS()
+# xxx sfa-1.0-10-broken - non-working attempt for python-2.7
+#            HTTPS = httplib.HTTPSConnection(host, None)
         except AttributeError:
             raise NotImplementedError(
                 "your version of httplib doesn't support HTTPS"
                 )
         else:
-            return httplib.HTTPSConnection(host, None, key_file=self.key_file, cert_file=self.cert_file) #**(x509 or {}))
+            return httplib.HTTPS(host, None, key_file=self.key_file, cert_file=self.cert_file) #**(x509 or {}))
+# xxx sfa-1.0-10-broken - non-working attempt for python-2.7
+#            return httplib.HTTPSConnection(host, None, key_file=self.key_file, cert_file=self.cert_file) #**(x509 or {}))
 
     def getparser(self):
         unmarshaller = ExceptionUnmarshaller()