From 026b1b5307939e6a75ec4866e21cd420733370cb Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 14 Sep 2015 14:03:58 +0200 Subject: Use six.moves.http_client instead of httplib The module was renamed in Python 3. Reviewed-By: David Kupka Reviewed-By: Jan Cholasta Reviewed-By: Martin Basti --- ipaserver/install/cainstance.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'ipaserver/install/cainstance.py') 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 -- cgit