From 53c787c0df2ea13c9252ede5a02449dcd7f60604 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 30 Dec 2010 21:47:08 +0100
Subject: [PATCH] this was intended to be part of previous commit..
---
sfa/util/xmlrpcprotocol.py | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/sfa/util/xmlrpcprotocol.py b/sfa/util/xmlrpcprotocol.py
index d06d1304..2d2586e8 100644
--- a/sfa/util/xmlrpcprotocol.py
+++ b/sfa/util/xmlrpcprotocol.py
@@ -1,5 +1,6 @@
# XMLRPC-specific code for SFA Client
+import httplib
import xmlrpclib
from sfa.util.sfalogging import sfa_logger
@@ -31,16 +32,12 @@ class XMLRPCTransport(xmlrpclib.Transport):
def make_connection(self, host):
# create a HTTPS connection object from a host descriptor
# host may be a string, or a (host, x509-dict) tuple
- import httplib
host, extra_headers, x509 = self.get_host_info(host)
try:
-# HTTPS = httplib.HTTPS()
- HTTPS = httplib.HTTPSConnection(host, None)
- except AttributeError:
- raise NotImplementedError("your version of httplib doesn't support HTTPSConnection")
- else:
# return httplib.HTTPS(host, None, key_file=self.key_file, cert_file=self.cert_file) #**(x509 or {}))
return httplib.HTTPSConnection(host, None, key_file=self.key_file, cert_file=self.cert_file) #**(x509 or {}))
+ except AttributeError:
+ raise NotImplementedError("your version of httplib doesn't support HTTPSConnection")
def getparser(self):
unmarshaller = ExceptionUnmarshaller()
--
2.47.0