Make configparser imports python3 ready

the ConfigParser module was renamed to configparser in Python3.  Use
six.moves to import it so that the modules will function on Python3.
This commit is contained in:
Toshio Kuratomi 2017-02-03 10:01:53 -08:00
parent 272ff10fa1
commit f75ffe46db
8 changed files with 41 additions and 45 deletions

View file

@ -189,9 +189,10 @@ EXAMPLES = '''
'''
import os
import ssl as ssl_lib
import ConfigParser
from distutils.version import LooseVersion
try:
from pymongo.errors import ConnectionFailure
from pymongo.errors import OperationFailure
@ -207,6 +208,11 @@ except ImportError:
else:
pymongo_found = True
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils.six.moves import configparser
# =========================================
# MongoDB module specific support methods.
#
@ -279,7 +285,7 @@ def user_remove(module, client, db_name, user):
module.exit_json(changed=False, user=user)
def load_mongocnf():
config = ConfigParser.RawConfigParser()
config = configparser.RawConfigParser()
mongocnf = os.path.expanduser('~/.mongodb.cnf')
try:
@ -288,7 +294,7 @@ def load_mongocnf():
user=config.get('client', 'user'),
password=config.get('client', 'pass')
)
except (ConfigParser.NoOptionError, IOError):
except (configparser.NoOptionError, IOError):
return False
return creds
@ -446,9 +452,6 @@ def main():
module.exit_json(changed=True, user=user)
# import module snippets
from ansible.module_utils.basic import *
from ansible.module_utils.pycompat24 import get_exception
if __name__ == '__main__':
main()