diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2017-02-03 10:01:53 -0800 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2017-02-03 21:15:34 -0800 |
| commit | f75ffe46db3c6731d5f4ecf2ad789dc7c3c332cb (patch) | |
| tree | e0f0ea0e96845bc7f2f7edf26c5cfffe1a63b5ac /lib/ansible/modules/packaging/os | |
| parent | 272ff10fa13e949eb637506969c40da453aae821 (diff) | |
| download | ansible-f75ffe46db3c6731d5f4ecf2ad789dc7c3c332cb.tar.gz | |
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.
Diffstat (limited to 'lib/ansible/modules/packaging/os')
| -rw-r--r-- | lib/ansible/modules/packaging/os/redhat_subscription.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/ansible/modules/packaging/os/redhat_subscription.py b/lib/ansible/modules/packaging/os/redhat_subscription.py index d65c29d26b..0bcb9853f0 100644 --- a/lib/ansible/modules/packaging/os/redhat_subscription.py +++ b/lib/ansible/modules/packaging/os/redhat_subscription.py @@ -160,8 +160,10 @@ EXAMPLES = ''' import os import re import types -import ConfigParser -import shlex + +from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.pycompat24 import get_exception +from ansible.module_utils.six.moves import configparser class RegistrationBase(object): @@ -191,7 +193,7 @@ class RegistrationBase(object): def update_plugin_conf(self, plugin, enabled=True): plugin_conf = '/etc/yum/pluginconf.d/%s.conf' % plugin if os.path.isfile(plugin_conf): - cfg = ConfigParser.ConfigParser() + cfg = configparser.ConfigParser() cfg.read([plugin_conf]) if enabled: cfg.set('main', 'enabled', 1) @@ -219,7 +221,7 @@ class Rhsm(RegistrationBase): ''' # Read RHSM defaults ... - cp = ConfigParser.ConfigParser() + cp = configparser.ConfigParser() cp.read(rhsm_conf) # Add support for specifying a default value w/o having to standup some configuration @@ -231,7 +233,7 @@ class Rhsm(RegistrationBase): else: return default - cp.get_option = types.MethodType(get_option_default, cp, ConfigParser.ConfigParser) + cp.get_option = types.MethodType(get_option_default, cp, configparser.ConfigParser) return cp @@ -559,8 +561,5 @@ def main(): module.exit_json(changed=True, msg="System successfully unregistered from %s." % server_hostname) -# import module snippets -from ansible.module_utils.basic import * - if __name__ == '__main__': main() |