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 --- ipapython/dogtag.py | 8 +++++++- ipapython/nsslib.py | 10 +++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'ipapython') 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 -- cgit