mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2026-11-02 20:30:26 -06:00
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>
This commit is contained in:
1 parent
187efdfe42
commit
026b1b5307
4 files changed
+30
-5
No files matched your search
+9
-1
@@ -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
|
||||
|
||||
Reference in new issue
Block a user