From ad2bc947256a8b5611f21b4c171f7d2142454069 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 14 Sep 2015 13:22:38 +0200 Subject: Use six.moves.xmlrpc.client instead of xmlrpclib The module is renamed to xmlrpc.client in Python 3. Reviewed-By: David Kupka Reviewed-By: Jan Cholasta Reviewed-By: Martin Basti --- ipapython/nsslib.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ipapython/nsslib.py') diff --git a/ipapython/nsslib.py b/ipapython/nsslib.py index da4521894..fbe607506 100644 --- a/ipapython/nsslib.py +++ b/ipapython/nsslib.py @@ -296,14 +296,14 @@ class NSSConnection(httplib.HTTPConnection, NSSAddressFamilyFallback): raise e class NSSHTTPS(httplib.HTTP): - # We would like to use HTTP 1.1 not the older HTTP 1.0 but xmlrpclib + # We would like to use HTTP 1.1 not the older HTTP 1.0 but xmlrpc.client # and httplib do not play well together. httplib when the protocol - # is 1.1 will add a host header in the request. But xmlrpclib + # is 1.1 will add a host header in the request. But xmlrpc.client # always adds a host header irregardless of the HTTP protocol # version. That means the request ends up with 2 host headers, # but Apache freaks out if it sees 2 host headers, a known Apache # issue. httplib has a mechanism to skip adding the host header - # (i.e. skip_host in HTTPConnection.putrequest()) but xmlrpclib + # (i.e. skip_host in HTTPConnection.putrequest()) but xmlrpc.client # doesn't use it. Oh well, back to 1.0 :-( # #_http_vsn = 11 -- cgit