diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-09-14 13:22:38 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-10-07 10:27:20 +0200 |
| commit | ad2bc947256a8b5611f21b4c171f7d2142454069 (patch) | |
| tree | df48f8e5b12fd1d6d64c638a0d7534a38333326d /ipapython | |
| parent | 70b37a956c0b7dad52bf14fdb5fed421c01c8f77 (diff) | |
Use six.moves.xmlrpc.client instead of xmlrpclib
The module is renamed to xmlrpc.client in Python 3.
Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/cookie.py | 2 | ||||
| -rw-r--r-- | ipapython/ipautil.py | 1 | ||||
| -rw-r--r-- | ipapython/nsslib.py | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/ipapython/cookie.py b/ipapython/cookie.py index 84de94c9c..d51b005a2 100644 --- a/ipapython/cookie.py +++ b/ipapython/cookie.py @@ -49,7 +49,7 @@ the relevant RFC's as well as actual practice in the field. However cookielib.py is tighly integrated with urllib2 and it's not possible to use most of the features of cookielib without simultaneously using urllib2. Unfortunataely we only use httplib because of our dependency -on xmlrpclib. Without urllib2 cookielib is a non-starter. +on xmlrpc.client. Without urllib2 cookielib is a non-starter. This module is a minimal implementation of Netscape cookies which works equally well on either the client or server side. It's API is diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index 9e710f955..960c9d5ea 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -31,7 +31,6 @@ import socket import struct from types import * import re -import xmlrpclib import datetime import netaddr import time 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 |