Remove wildcard, add boilerplate and get rid of get_exception

* smaller collections of database modules
* Some of the smaller collections of network modules

lib/ansible/modules/network/ordnance/ordnance_config.py

@@ -1,20 +1,11 @@
 #!/usr/bin/python
 #
-# 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'],
@@ -195,14 +186,14 @@ backup_path:
 """
 import re
 import time
+import traceback
 
-
-from ansible.module_utils.basic import get_exception
-from ansible.module_utils.six import iteritems
-from ansible.module_utils.ordnance import get_config
 from ansible.module_utils.network import NetworkModule, NetworkError
 from ansible.module_utils.netcfg import NetworkConfig, dumps
 from ansible.module_utils.netcli import Command
+from ansible.module_utils.ordnance import get_config
+from ansible.module_utils.six import iteritems
+from ansible.module_utils._text import to_native
 
 
 def check_args(module, warnings):
@@ -369,10 +360,9 @@ def main():
 
     try:
         run(module, result)
-    except NetworkError:
-        exc = get_exception()
+    except NetworkError as e:
         module.disconnect()
-        module.fail_json(msg=str(exc))
+        module.fail_json(msg=to_native(e), exception=traceback.format_exc())
 
     module.disconnect()
     module.exit_json(**result)

lib/ansible/modules/network/ordnance/ordnance_facts.py

@@ -1,20 +1,12 @@
 #!/usr/bin/python
 #
-# 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'],
                     'supported_by': 'community'}
@@ -101,7 +93,6 @@ ansible_net_interfaces:
   returned: when interfaces is configured
   type: dict
 """
-import itertools
 import re
 import traceback
 
@@ -124,6 +115,7 @@ class FactsBase(object):
         except:
             self.failed_commands.append(cmd)
 
+
 class Config(FactsBase):
 
     def populate(self):