diff options
| author | Pierre-Louis Bonicoli <pierre-louis.bonicoli@libregerbil.fr> | 2017-07-15 03:32:47 +0200 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2017-08-12 10:21:14 -0700 |
| commit | f761fc1d1ff43d261b897cdcc5bddb39aa43afd8 (patch) | |
| tree | 13fd4931ff6064c21716468c44fd96e517d784eb | |
| parent | 5f62a973da0312aa48ca34dae06b52e3650af112 (diff) | |
| download | ansible-f761fc1d1ff43d261b897cdcc5bddb39aa43afd8.tar.gz | |
rhn_channel: fix py3 compatibility (use six)
and remove unused import
| -rw-r--r-- | lib/ansible/modules/packaging/os/rhn_channel.py | 12 | ||||
| -rw-r--r-- | test/sanity/import/skip.txt | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/lib/ansible/modules/packaging/os/rhn_channel.py b/lib/ansible/modules/packaging/os/rhn_channel.py index 814a1b4c27..86aaa46a2b 100644 --- a/lib/ansible/modules/packaging/os/rhn_channel.py +++ b/lib/ansible/modules/packaging/os/rhn_channel.py @@ -64,9 +64,8 @@ EXAMPLES = ''' password: guessme ''' -import xmlrpclib -from operator import itemgetter -import re +from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.six.moves import xmlrpc_client # ------------------------------------------------------- # @@ -137,8 +136,8 @@ def main(): user = module.params['user'] password = module.params['password'] - #initialize connection - client = xmlrpclib.Server(saturl, verbose=0) + # initialize connection + client = xmlrpc_client(saturl) session = client.auth.login(user, password) # get systemid @@ -165,8 +164,5 @@ def main(): client.auth.logout(session) -# import module snippets -from ansible.module_utils.basic import * - if __name__ == '__main__': main() diff --git a/test/sanity/import/skip.txt b/test/sanity/import/skip.txt index f5a4ae42f9..99ec588cce 100644 --- a/test/sanity/import/skip.txt +++ b/test/sanity/import/skip.txt @@ -97,7 +97,6 @@ lib/ansible/modules/network/lenovo/cnos_vlag.py lib/ansible/modules/network/lenovo/cnos_vlan.py lib/ansible/modules/network/nxos/nxos_file_copy.py lib/ansible/modules/packaging/language/maven_artifact.py -lib/ansible/modules/packaging/os/rhn_channel.py lib/ansible/modules/storage/infinidat/infini_export.py lib/ansible/modules/storage/infinidat/infini_export_client.py lib/ansible/modules/storage/infinidat/infini_fs.py |