From 184f6f08da4a5d8582dc4cbd8966501fa012c7f4 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Mon, 22 Jul 2019 18:27:02 +0200
Subject: [PATCH] iipaclient: RawConfigParser is not always provided by
six.moves.configparser
six.moves.configparser does not always provide RawConfigParser.
---
roles/ipaclient/library/ipaclient_get_facts.py | 5 ++++-
roles/ipaclient/library/ipaclient_test.py | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/roles/ipaclient/library/ipaclient_get_facts.py b/roles/ipaclient/library/ipaclient_get_facts.py
index 305635fa..1492199b 100644
--- a/roles/ipaclient/library/ipaclient_get_facts.py
+++ b/roles/ipaclient/library/ipaclient_get_facts.py
@@ -4,7 +4,10 @@
import os
import re
import six
-from six.moves.configparser import RawConfigParser
+try:
+ from six.moves.configparser import RawConfigParser
+except ImportError:
+ from ConfigParser import RawConfigParser
from ansible.module_utils.basic import AnsibleModule
diff --git a/roles/ipaclient/library/ipaclient_test.py b/roles/ipaclient/library/ipaclient_test.py
index 7e303586..49e517e9 100644
--- a/roles/ipaclient/library/ipaclient_test.py
+++ b/roles/ipaclient/library/ipaclient_test.py
@@ -192,7 +192,11 @@ import os
import socket
import inspect
-from six.moves.configparser import RawConfigParser
+try:
+ from six.moves.configparser import RawConfigParser
+except ImportError:
+ from ConfigParser import RawConfigParser
+
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ansible_ipa_client import (
paths, sysrestore, options, CheckedIPAddress, validate_domain_name,
--
GitLab