From b6528ea19fa1a59c37c6fdf154361758d8252f25 Mon Sep 17 00:00:00 2001 From: Pilou Date: Wed, 13 Dec 2017 07:51:34 +0100 Subject: [PATCH] ovirt_disk: fix Python 3 compatibility (use six) (#33730) --- lib/ansible/modules/cloud/ovirt/ovirt_disk.py | 4 +--- test/sanity/import/skip.txt | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_disk.py b/lib/ansible/modules/cloud/ovirt/ovirt_disk.py index 9927ce6fcf0..836cd1f0de5 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_disk.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_disk.py @@ -233,9 +233,7 @@ import time import traceback import ssl -from httplib import HTTPSConnection -from httplib import IncompleteRead - +from ansible.module_utils.six.moves.http_client import HTTPSConnection, IncompleteRead from ansible.module_utils.six.moves.urllib.parse import urlparse try: diff --git a/test/sanity/import/skip.txt b/test/sanity/import/skip.txt index d3335f1a132..8dcd1b3372f 100644 --- a/test/sanity/import/skip.txt +++ b/test/sanity/import/skip.txt @@ -6,7 +6,6 @@ lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py lib/ansible/modules/cloud/dimensiondata/dimensiondata_network.py lib/ansible/modules/cloud/google/gcdns_record.py lib/ansible/modules/cloud/google/gcdns_zone.py -lib/ansible/modules/cloud/ovirt/ovirt_disk.py lib/ansible/modules/cloud/webfaction/webfaction_app.py lib/ansible/modules/cloud/webfaction/webfaction_db.py lib/ansible/modules/cloud/webfaction/webfaction_domain.py