diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-09-14 14:03:58 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-10-07 10:27:20 +0200 |
| commit | 026b1b5307939e6a75ec4866e21cd420733370cb (patch) | |
| tree | 150bb169b1d71bfb9167c79e56fc8efeed5bc811 /ipaserver/install/cainstance.py | |
| parent | 187efdfe42e039d6c7e39bab00a1d22751c393e6 (diff) | |
| download | freeipa-026b1b5307939e6a75ec4866e21cd420733370cb.tar.gz freeipa-026b1b5307939e6a75ec4866e21cd420733370cb.tar.xz freeipa-026b1b5307939e6a75ec4866e21cd420733370cb.zip | |
Use six.moves.http_client instead of httplib
The module was renamed 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 'ipaserver/install/cainstance.py')
| -rw-r--r-- | ipaserver/install/cainstance.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index dd24fd845..f0b3d0c11 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -25,7 +25,6 @@ import array import base64 import binascii import dbus -import httplib import ldap import os import pwd @@ -69,6 +68,13 @@ from ipaserver.install.dogtaginstance import DogtagInstance from ipaserver.install.dogtaginstance import PKI_USER, DEFAULT_DSPORT from ipaserver.plugins import ldap2 +# Python 3 rename. The package is available in "six.moves.http_client", but +# pylint cannot handle classes from that alias +try: + import httplib +except ImportError: + import http.client as httplib + # When IPA is installed with DNS support, this CNAME should hold all IPA # replicas with CA configured |