From 3cd98a9fccdd8ac7f241e7b64718e8dedd6cd7fd Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Tue, 9 Apr 2019 13:17:59 -0400 Subject: Use ansible.module_utils.six in inventory scripts (#55000) * Use six from ansible.module_utils for inventory scripts Remove skips from sanity test * Change all imports of ConfigParser to use module_utils.six.moves * Remove commented out lines * Fix six imports --- contrib/inventory/azure_rm.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'contrib/inventory/azure_rm.py') diff --git a/contrib/inventory/azure_rm.py b/contrib/inventory/azure_rm.py index a83558cd49..7dc438f6a2 100755 --- a/contrib/inventory/azure_rm.py +++ b/contrib/inventory/azure_rm.py @@ -201,14 +201,8 @@ import re import sys import inspect -try: - # python2 - import ConfigParser as cp -except ImportError: - # python3 - import configparser as cp - from os.path import expanduser +from ansible.module_utils.six.moves import configparser as cp import ansible.module_utils.six.moves.urllib.parse as urlparse HAS_AZURE = True -- cgit v1.2.1