4 files changed, 30 insertions, 5 deletions
diff --git a/ipapython/dogtag.py b/ipapython/dogtag.py
index bad8039f2..51c2ec9b4 100644
--- a/ipapython/dogtag.py
+++ b/ipapython/dogtag.py
@@ -19,7 +19,6 @@
 
 import collections
 import os
-import httplib
 import xml.dom.minidom
 
 import nss.nss as nss
@@ -34,6 +33,13 @@ from ipapython import nsslib, ipautil
 from ipaplatform.paths import paths
 from ipapython.ipa_log_manager import *
 
+# 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
+
 if six.PY3:
     unicode = str
 
diff --git a/ipapython/nsslib.py b/ipapython/nsslib.py
index fbe607506..0d02e768b 100644
--- a/ipapython/nsslib.py
+++ b/ipapython/nsslib.py
@@ -21,7 +21,6 @@
 from __future__ import print_function
 
 import sys
-import httplib
 import getpass
 import socket
 from ipapython.ipa_log_manager import *
@@ -31,6 +30,14 @@ import nss.io as io
 import nss.nss as nss
 import nss.ssl as ssl
 import nss.error as error
+
+# 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
+
 from ipaplatform.paths import paths
 
 # NSS database currently open
@@ -295,6 +302,7 @@ class NSSConnection(httplib.HTTPConnection, NSSAddressFamilyFallback):
             self.close()
             raise e
 
+
 class NSSHTTPS(httplib.HTTP):
     # 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
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
diff --git a/ipatests/test_ipaserver/httptest.py b/ipatests/test_ipaserver/httptest.py
index 891364c06..75d30aff8 100644
--- a/ipatests/test_ipaserver/httptest.py
+++ b/ipatests/test_ipaserver/httptest.py
@@ -20,12 +20,17 @@
 Base class for HTTP request tests
 """
 
-import httplib
-
 from six.moves import urllib
 
 from ipalib import api
 
+# 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
+
 class Unauthorized_HTTP_test(object):
     """
     Base class for simple HTTP request tests executed against URI