Remove wildcard imports

Made the following changes: * Removed wildcard imports * Replaced long form of GPL header with short form * Removed get_exception usage * Added from __future__ boilerplate * Adjust division operator to // where necessary For the following files: * web_infrastructure modules * system modules * linode, lxc, lxd, atomic, cloudscale, dimensiondata, ovh, packet, profitbricks, pubnub, smartos, softlayer, univention modules * compat dirs (disabled as its used intentionally)
2025-07-22 12:50:22 -07:00 · 2017-07-27 22:55:24 -07:00 · 2017-07-27 22:55:24 -07:00 · 4e6cce354e
commit 4e6cce354e
parent f6d7fc548e
185 changed files with 1657 additions and 3459 deletions
--- a/lib/ansible/modules/remote_management/foreman/foreman.py
+++ b/lib/ansible/modules/remote_management/foreman/foreman.py
@ -1,21 +1,11 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # (c) 2016, Eric D Helms <ericdhelms@gmail.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@ -71,15 +61,19 @@ EXAMPLES = '''

 RETURN = '''# '''

-import datetime
+import traceback

 try:
-    from nailgun import entities, entity_fields
+    from nailgun import entities
    from nailgun.config import ServerConfig
    HAS_NAILGUN_PACKAGE = True
 except:
    HAS_NAILGUN_PACKAGE = False

+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils._text import to_native
+
+
 class NailGun(object):
    def __init__(self, server, entities, module):
        self._server = server
@ -144,7 +138,8 @@ def main():
        org = entities.Organization(server)
        org.search()
    except Exception as e:
-        module.fail_json(msg="Failed to connect to Foreman server: %s " % e)
+        module.fail_json(msg="Failed to connect to Foreman server: %s " % to_native(e),
+                         exception=traceback.format_exc())

    if entity == 'organization':
        ng.organization(params)
@ -152,8 +147,6 @@ def main():
    else:
        module.fail_json(changed=False, result="Unsupported entity supplied")

-# import module snippets
-from ansible.module_utils.basic import *

 if __name__ == '__main__':
    main()
--- a/lib/ansible/modules/remote_management/foreman/katello.py
+++ b/lib/ansible/modules/remote_management/foreman/katello.py
@ -1,21 +1,11 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # (c) 2016, Eric D Helms <ericdhelms@gmail.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@ -139,6 +129,8 @@ EXAMPLES = '''
 RETURN = '''# '''

 import datetime
+import os
+import traceback

 try:
    from nailgun import entities, entity_fields, entity_mixins
@ -147,6 +139,9 @@ try:
 except:
    HAS_NAILGUN_PACKAGE = False

+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils._text import to_native
+

 class NailGun(object):
    def __init__(self, server, entities, module):
@ -242,13 +237,13 @@ class NailGun(object):
                files={'content': content}
            )
            return True
-        except Exception:
-            e = get_exception()
+        except Exception as e:

            if "Import is the same as existing data" in e.message:
                return False
            else:
-                self._module.fail_json(msg="Manifest import failed with %s" % e)
+                self._module.fail_json(msg="Manifest import failed with %s" % to_native(e),
+                                       exception=traceback.format_exc())

    def product(self, params):
        org = self.find_organization(params['organization'])
@ -519,8 +514,6 @@ def main():

    module.exit_json(changed=result, result="%s updated" % entity)

-# import module snippets
-from ansible.module_utils.basic import *

 if __name__ == '__main__':
    main()
--- a/lib/ansible/modules/remote_management/hpilo/hpilo_boot.py
+++ b/lib/ansible/modules/remote_management/hpilo/hpilo_boot.py
@ -2,21 +2,11 @@
 # -*- coding: utf-8 -*-

 # Copyright 2012 Dag Wieers <dag@wieers.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@ -113,10 +103,8 @@ RETURN = '''
 # Default return values
 '''

-
 import time
 import warnings
-from ansible.module_utils.basic import AnsibleModule

 try:
    import hpilo
@ -124,6 +112,8 @@ try:
 except ImportError:
    HAS_HPILO = False

+from ansible.module_utils.basic import AnsibleModule
+

 # Suppress warnings from hpilo
 warnings.simplefilter('ignore')
@ -213,5 +203,6 @@ def main():

    module.exit_json(changed=changed, power=power_status, **status)

+
 if __name__ == '__main__':
    main()
--- a/lib/ansible/modules/remote_management/hpilo/hpilo_facts.py
+++ b/lib/ansible/modules/remote_management/hpilo/hpilo_facts.py
@ -2,21 +2,11 @@
 # -*- coding: utf-8 -*-

 # Copyright 2012 Dag Wieers <dag@wieers.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@ -131,7 +121,6 @@ hw_uuid:

 import re
 import warnings
-from ansible.module_utils.basic import AnsibleModule

 try:
    import hpilo
@ -139,6 +128,8 @@ try:
 except ImportError:
    HAS_HPILO = False

+from ansible.module_utils.basic import AnsibleModule
+

 # Suppress warnings from hpilo
 warnings.simplefilter('ignore')
--- a/lib/ansible/modules/remote_management/hpilo/hponcfg.py
+++ b/lib/ansible/modules/remote_management/hpilo/hponcfg.py
@ -2,21 +2,11 @@
 # -*- coding: utf-8 -*-

 # (c) 2012, Dag Wieers <dag@wieers.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@ -102,5 +92,6 @@ def main():

    module.exit_json(changed=changed, stdout=stdout, stderr=stderr)

+
 if __name__ == '__main__':
    main()
--- a/lib/ansible/modules/remote_management/imc/imc_xml.py
+++ b/lib/ansible/modules/remote_management/imc/imc_xml.py
@ -1,21 +1,11 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # (c) 2017, Dag Wieers <dag@wieers.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type

-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@ -228,15 +218,10 @@ output:
      errorDescr="XML PARSING ERROR: Element 'computeRackUnit', attribute 'admin_Power': The attribute 'admin_Power' is not allowed.\n"/>
 '''

-
 import atexit
 import itertools
 import os

-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.pycompat24 import get_exception
-from ansible.module_utils.urls import fetch_url
-
 try:
    import lxml.etree
    HAS_LXML_ETREE = True
@ -249,6 +234,9 @@ try:
 except ImportError:
    HAS_XMLJSON_COBRA = False

+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.urls import fetch_url
+

 def imc_response(module, rawoutput, rawinput=''):
    ''' Handle IMC returned data '''
--- a/lib/ansible/modules/remote_management/ipmi/ipmi_boot.py
+++ b/lib/ansible/modules/remote_management/ipmi/ipmi_boot.py
@ -1,20 +1,12 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright: Ansible Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@ -126,7 +118,7 @@ try:
 except ImportError:
    command = None

-from ansible.module_utils.basic import *
+from ansible.module_utils.basic import AnsibleModule


 def main():
--- a/lib/ansible/modules/remote_management/ipmi/ipmi_power.py
+++ b/lib/ansible/modules/remote_management/ipmi/ipmi_power.py
@ -1,20 +1,12 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright: Ansible Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@ -90,7 +82,7 @@ try:
 except ImportError:
    command = None

-from ansible.module_utils.basic import *
+from ansible.module_utils.basic import AnsibleModule


 def main():
--- a/lib/ansible/modules/remote_management/stacki/stacki_host.py
+++ b/lib/ansible/modules/remote_management/stacki/stacki_host.py
@ -2,19 +2,11 @@
 # -*- coding: utf-8 -*-

 # (c) 2016, Hugh Ma <Hugh.Ma@flextronics.com>
-#
-# This module is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this software.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@ -110,12 +102,10 @@ stdout_lines:

 import json
 import os
-import re
-import tempfile

 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six.moves.urllib.parse import urlencode
-from ansible.module_utils.urls import fetch_url, ConnectionError
+from ansible.module_utils.urls import fetch_url


 class StackiHost(object):
@ -194,10 +184,10 @@ class StackiHost(object):

    def stack_sync(self):

-        res = self.do_request(self.module, self.endpoint, payload=json.dumps({ "cmd": "sync config"}),
+        self.do_request(self.module, self.endpoint, payload=json.dumps({ "cmd": "sync config"}),
                              headers=self.header, method="POST")

-        res = self.do_request(self.module, self.endpoint, payload=json.dumps({"cmd": "sync host config"}),
+        self.do_request(self.module, self.endpoint, payload=json.dumps({"cmd": "sync host config"}),
                              headers=self.header, method="POST")


@ -208,7 +198,7 @@ class StackiHost(object):

        data['cmd'] = "set host boot {0} action=install" \
            .format(self.hostname)
-        res = self.do_request(self.module, self.endpoint, payload=json.dumps(data),
+        self.do_request(self.module, self.endpoint, payload=json.dumps(data),
                              headers=self.header, method="POST")
        changed = True

@ -224,7 +214,7 @@ class StackiHost(object):

        data['cmd'] = "add host {0} rack={1} rank={2} appliance={3}"\
            .format(self.hostname, self.rack, self.rank, self.appliance)
-        res = self.do_request(self.module, self.endpoint, payload=json.dumps(data),
+        self.do_request(self.module, self.endpoint, payload=json.dumps(data),
                              headers=self.header, method="POST")

        self.stack_sync()
@ -239,7 +229,7 @@ class StackiHost(object):

        data['cmd'] = "remove host {0}"\
            .format(self.hostname)
-        res = self.do_request(self.module, self.endpoint, payload=json.dumps(data),
+        self.do_request(self.module, self.endpoint, payload=json.dumps(data),
                              headers=self.header, method="POST")

        self.stack_sync()
--- a/lib/ansible/modules/remote_management/wakeonlan.py
+++ b/lib/ansible/modules/remote_management/wakeonlan.py
@ -2,21 +2,11 @@
 # -*- coding: utf-8 -*-

 # (c) 2016, Dag Wieers <dag@wieers.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@ -70,11 +60,12 @@ EXAMPLES = r'''
 RETURN = r'''
 # Default return values
 '''
-
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.pycompat24 import get_exception
 import socket
 import struct
+import traceback
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils._text import to_native


 def wakeonlan(module, mac, broadcast, port):
@ -110,10 +101,9 @@ def wakeonlan(module, mac, broadcast, port):

        try:
            sock.sendto(data, (broadcast, port))
-        except socket.error:
-            e = get_exception()
+        except socket.error as e:
            sock.close()
-            module.fail_json(msg=str(e))
+            module.fail_json(msg=to_native(e), exception=traceback.format_exc())

    sock.close()