From 96a5914eb6806da70a27391ff449813f88c4a458 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 9 Dec 2019 13:32:36 -0500 Subject: [PATCH] Remove from __future__ lines We only support python3 Change-Id: Ieb82eb3369c4ac73f3595dc84ca11e1f11766a79 --- plugins/inventory/openstack.py | 1 - plugins/modules/os_auth.py | 2 -- plugins/modules/os_client_config.py | 2 -- plugins/modules/os_coe_cluster.py | 2 -- plugins/modules/os_coe_cluster_template.py | 2 -- plugins/modules/os_flavor_info.py | 2 -- plugins/modules/os_floating_ip.py | 2 -- plugins/modules/os_group.py | 2 -- plugins/modules/os_group_info.py | 2 -- plugins/modules/os_image.py | 2 -- plugins/modules/os_image_info.py | 2 -- plugins/modules/os_ironic.py | 2 -- plugins/modules/os_ironic_inspect.py | 2 -- plugins/modules/os_ironic_node.py | 2 -- plugins/modules/os_keypair.py | 2 -- plugins/modules/os_keystone_domain.py | 2 -- plugins/modules/os_keystone_domain_info.py | 2 -- plugins/modules/os_keystone_endpoint.py | 2 -- plugins/modules/os_keystone_role.py | 2 -- plugins/modules/os_keystone_service.py | 2 -- plugins/modules/os_listener.py | 2 -- plugins/modules/os_loadbalancer.py | 2 -- plugins/modules/os_member.py | 2 -- plugins/modules/os_network.py | 2 -- plugins/modules/os_networks_info.py | 2 -- plugins/modules/os_nova_flavor.py | 2 -- plugins/modules/os_nova_host_aggregate.py | 2 -- plugins/modules/os_object.py | 2 -- plugins/modules/os_pool.py | 2 -- plugins/modules/os_port.py | 2 -- plugins/modules/os_port_info.py | 2 -- plugins/modules/os_project.py | 2 -- plugins/modules/os_project_access.py | 2 -- plugins/modules/os_project_info.py | 2 -- plugins/modules/os_quota.py | 2 -- plugins/modules/os_recordset.py | 2 -- plugins/modules/os_router.py | 2 -- plugins/modules/os_routers_info.py | 2 -- plugins/modules/os_security_group.py | 2 -- plugins/modules/os_security_group_rule.py | 2 -- plugins/modules/os_server.py | 2 -- plugins/modules/os_server_action.py | 2 -- plugins/modules/os_server_group.py | 2 -- plugins/modules/os_server_info.py | 2 -- plugins/modules/os_server_metadata.py | 2 -- plugins/modules/os_server_volume.py | 2 -- plugins/modules/os_stack.py | 2 -- plugins/modules/os_subnet.py | 2 -- plugins/modules/os_subnets_info.py | 2 -- plugins/modules/os_user.py | 2 -- plugins/modules/os_user_group.py | 2 -- plugins/modules/os_user_info.py | 2 -- plugins/modules/os_user_role.py | 2 -- plugins/modules/os_volume.py | 2 -- plugins/modules/os_volume_snapshot.py | 2 -- plugins/modules/os_zone.py | 2 -- tests/unit/compat/builtins.py | 1 - tests/unit/compat/mock.py | 1 - tests/unit/compat/unittest.py | 1 - tests/unit/mock/loader.py | 1 - tests/unit/mock/procenv.py | 1 - tests/unit/mock/vault_helper.py | 1 - tests/unit/modules/cloud/openstack/test_os_routers_info.py | 1 - tests/unit/plugins/inventory/test_openstack.py | 1 - tools/build.py | 4 ---- 65 files changed, 123 deletions(-) diff --git a/plugins/inventory/openstack.py b/plugins/inventory/openstack.py index a7836e1d..b2ed6297 100644 --- a/plugins/inventory/openstack.py +++ b/plugins/inventory/openstack.py @@ -5,7 +5,6 @@ # Copyright (c) 2017 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) DOCUMENTATION = ''' --- diff --git a/plugins/modules/os_auth.py b/plugins/modules/os_auth.py index 3d646c6e..c51ed396 100644 --- a/plugins/modules/os_auth.py +++ b/plugins/modules/os_auth.py @@ -3,8 +3,6 @@ # Copyright (c) 2015 Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_client_config.py b/plugins/modules/os_client_config.py index 6168db11..81437e83 100644 --- a/plugins/modules/os_client_config.py +++ b/plugins/modules/os_client_config.py @@ -4,8 +4,6 @@ # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], 'supported_by': 'community'} diff --git a/plugins/modules/os_coe_cluster.py b/plugins/modules/os_coe_cluster.py index 0a6d87a6..7a63ac4c 100644 --- a/plugins/modules/os_coe_cluster.py +++ b/plugins/modules/os_coe_cluster.py @@ -3,8 +3,6 @@ # Copyright (c) 2018 Catalyst IT Ltd. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_coe_cluster_template.py b/plugins/modules/os_coe_cluster_template.py index 0d2147a9..3356717f 100644 --- a/plugins/modules/os_coe_cluster_template.py +++ b/plugins/modules/os_coe_cluster_template.py @@ -3,8 +3,6 @@ # Copyright (c) 2018 Catalyst IT Ltd. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_flavor_info.py b/plugins/modules/os_flavor_info.py index 4facd158..5d5fb95b 100644 --- a/plugins/modules/os_flavor_info.py +++ b/plugins/modules/os_flavor_info.py @@ -3,8 +3,6 @@ # Copyright (c) 2015 IBM # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_floating_ip.py b/plugins/modules/os_floating_ip.py index 0d83363d..7a09a9d4 100644 --- a/plugins/modules/os_floating_ip.py +++ b/plugins/modules/os_floating_ip.py @@ -3,8 +3,6 @@ # Copyright: (c) 2015, Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_group.py b/plugins/modules/os_group.py index e99774b9..1ea9426b 100644 --- a/plugins/modules/os_group.py +++ b/plugins/modules/os_group.py @@ -2,8 +2,6 @@ # Copyright (c) 2016 IBM # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_group_info.py b/plugins/modules/os_group_info.py index 1ec308ce..0c3b9d8d 100644 --- a/plugins/modules/os_group_info.py +++ b/plugins/modules/os_group_info.py @@ -3,8 +3,6 @@ # Copyright (c) 2019, Phillipe Smith # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_image.py b/plugins/modules/os_image.py index c568289e..81e5c7ff 100644 --- a/plugins/modules/os_image.py +++ b/plugins/modules/os_image.py @@ -4,8 +4,6 @@ # Copyright (c) 2013, Benno Joy # 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 - # TODO(mordred): we need to support "location"(v1) and "locations"(v2) diff --git a/plugins/modules/os_image_info.py b/plugins/modules/os_image_info.py index c51d350d..4a03c226 100644 --- a/plugins/modules/os_image_info.py +++ b/plugins/modules/os_image_info.py @@ -3,8 +3,6 @@ # Copyright (c) 2015 Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_ironic.py b/plugins/modules/os_ironic.py index 0dcb72d6..8bb84308 100644 --- a/plugins/modules/os_ironic.py +++ b/plugins/modules/os_ironic.py @@ -4,8 +4,6 @@ # (c) 2014, Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_ironic_inspect.py b/plugins/modules/os_ironic_inspect.py index e2e90d68..acb3c7aa 100644 --- a/plugins/modules/os_ironic_inspect.py +++ b/plugins/modules/os_ironic_inspect.py @@ -4,8 +4,6 @@ # (c) 2015-2016, Hewlett Packard Enterprise Development Company LP # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_ironic_node.py b/plugins/modules/os_ironic_node.py index c0546416..af81164c 100644 --- a/plugins/modules/os_ironic_node.py +++ b/plugins/modules/os_ironic_node.py @@ -4,8 +4,6 @@ # (c) 2015, Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_keypair.py b/plugins/modules/os_keypair.py index 53a42484..bf08c612 100644 --- a/plugins/modules/os_keypair.py +++ b/plugins/modules/os_keypair.py @@ -5,8 +5,6 @@ # Copyright (c) 2013, John Dewey # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_keystone_domain.py b/plugins/modules/os_keystone_domain.py index d3e8361b..271c526b 100644 --- a/plugins/modules/os_keystone_domain.py +++ b/plugins/modules/os_keystone_domain.py @@ -2,8 +2,6 @@ # Copyright (c) 2015 Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_keystone_domain_info.py b/plugins/modules/os_keystone_domain_info.py index 5f7a8c8d..b35e430a 100644 --- a/plugins/modules/os_keystone_domain_info.py +++ b/plugins/modules/os_keystone_domain_info.py @@ -2,8 +2,6 @@ # Copyright (c) 2016 Hewlett-Packard Enterprise Corporation # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_keystone_endpoint.py b/plugins/modules/os_keystone_endpoint.py index c84d5b8f..632406f3 100644 --- a/plugins/modules/os_keystone_endpoint.py +++ b/plugins/modules/os_keystone_endpoint.py @@ -3,8 +3,6 @@ # Copyright: (c) 2017, VEXXHOST, Inc. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_keystone_role.py b/plugins/modules/os_keystone_role.py index d09ad323..5dbdae9c 100644 --- a/plugins/modules/os_keystone_role.py +++ b/plugins/modules/os_keystone_role.py @@ -2,8 +2,6 @@ # Copyright (c) 2016 IBM # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_keystone_service.py b/plugins/modules/os_keystone_service.py index f203e42e..843c5c26 100644 --- a/plugins/modules/os_keystone_service.py +++ b/plugins/modules/os_keystone_service.py @@ -2,8 +2,6 @@ # Copyright 2016 Sam Yaple # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_listener.py b/plugins/modules/os_listener.py index 495a590b..a34ec407 100644 --- a/plugins/modules/os_listener.py +++ b/plugins/modules/os_listener.py @@ -3,8 +3,6 @@ # Copyright (c) 2018 Catalyst Cloud Ltd. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_loadbalancer.py b/plugins/modules/os_loadbalancer.py index 25013e97..948b9f7e 100644 --- a/plugins/modules/os_loadbalancer.py +++ b/plugins/modules/os_loadbalancer.py @@ -3,8 +3,6 @@ # Copyright (c) 2018 Catalyst Cloud Ltd. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_member.py b/plugins/modules/os_member.py index 0249a715..af380197 100644 --- a/plugins/modules/os_member.py +++ b/plugins/modules/os_member.py @@ -3,8 +3,6 @@ # Copyright (c) 2018 Catalyst Cloud Ltd. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_network.py b/plugins/modules/os_network.py index ccf04c15..8321882f 100644 --- a/plugins/modules/os_network.py +++ b/plugins/modules/os_network.py @@ -4,8 +4,6 @@ # Copyright (c) 2013, Benno Joy # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_networks_info.py b/plugins/modules/os_networks_info.py index 97257b53..59e3f3e7 100644 --- a/plugins/modules/os_networks_info.py +++ b/plugins/modules/os_networks_info.py @@ -3,8 +3,6 @@ # Copyright (c) 2015 Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_nova_flavor.py b/plugins/modules/os_nova_flavor.py index 1f5c9406..8fd6d18f 100644 --- a/plugins/modules/os_nova_flavor.py +++ b/plugins/modules/os_nova_flavor.py @@ -3,8 +3,6 @@ # Copyright (c) 2015 Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_nova_host_aggregate.py b/plugins/modules/os_nova_host_aggregate.py index a1e8fe16..78427501 100644 --- a/plugins/modules/os_nova_host_aggregate.py +++ b/plugins/modules/os_nova_host_aggregate.py @@ -2,8 +2,6 @@ # Copyright 2016 Jakub Jursa # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_object.py b/plugins/modules/os_object.py index 24dd811e..b4af96fa 100644 --- a/plugins/modules/os_object.py +++ b/plugins/modules/os_object.py @@ -4,8 +4,6 @@ # Copyright (c) 2013, Benno Joy # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_pool.py b/plugins/modules/os_pool.py index c93112e2..0368f698 100644 --- a/plugins/modules/os_pool.py +++ b/plugins/modules/os_pool.py @@ -3,8 +3,6 @@ # Copyright (c) 2018 Catalyst Cloud Ltd. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_port.py b/plugins/modules/os_port.py index 8a13083c..764ad267 100644 --- a/plugins/modules/os_port.py +++ b/plugins/modules/os_port.py @@ -3,8 +3,6 @@ # Copyright (c) 2015 Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_port_info.py b/plugins/modules/os_port_info.py index 822ece24..ee3ac666 100644 --- a/plugins/modules/os_port_info.py +++ b/plugins/modules/os_port_info.py @@ -3,8 +3,6 @@ # Copyright (c) 2016 IBM # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_project.py b/plugins/modules/os_project.py index 8f8abe41..3144fdfc 100644 --- a/plugins/modules/os_project.py +++ b/plugins/modules/os_project.py @@ -2,8 +2,6 @@ # Copyright (c) 2015 IBM Corporation # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_project_access.py b/plugins/modules/os_project_access.py index 27dc7f75..47ea755c 100644 --- a/plugins/modules/os_project_access.py +++ b/plugins/modules/os_project_access.py @@ -13,8 +13,6 @@ # You should have received a copy of the GNU General Public License # along with this software. If not, see . -from __future__ import (absolute_import, division, print_function) - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], 'supported_by': 'community'} diff --git a/plugins/modules/os_project_info.py b/plugins/modules/os_project_info.py index 1d805b40..92ae3462 100644 --- a/plugins/modules/os_project_info.py +++ b/plugins/modules/os_project_info.py @@ -2,8 +2,6 @@ # Copyright (c) 2016 Hewlett-Packard Enterprise Corporation # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_quota.py b/plugins/modules/os_quota.py index 6aec9bb9..bcfc3201 100644 --- a/plugins/modules/os_quota.py +++ b/plugins/modules/os_quota.py @@ -2,8 +2,6 @@ # Copyright (c) 2016 Pason System Corporation # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_recordset.py b/plugins/modules/os_recordset.py index 78efb3ed..a396e7e0 100644 --- a/plugins/modules/os_recordset.py +++ b/plugins/modules/os_recordset.py @@ -2,8 +2,6 @@ # Copyright (c) 2016 Hewlett-Packard Enterprise # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_router.py b/plugins/modules/os_router.py index d98037f3..141c9d70 100644 --- a/plugins/modules/os_router.py +++ b/plugins/modules/os_router.py @@ -3,8 +3,6 @@ # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_routers_info.py b/plugins/modules/os_routers_info.py index b277e2f5..b762ca7d 100644 --- a/plugins/modules/os_routers_info.py +++ b/plugins/modules/os_routers_info.py @@ -3,8 +3,6 @@ # Copyright (c) 2019, Bram Verschueren # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_security_group.py b/plugins/modules/os_security_group.py index 097f98ed..f2a2ec46 100644 --- a/plugins/modules/os_security_group.py +++ b/plugins/modules/os_security_group.py @@ -4,8 +4,6 @@ # Copyright (c) 2013, Benno Joy # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_security_group_rule.py b/plugins/modules/os_security_group_rule.py index 6d86fc92..2850f01d 100644 --- a/plugins/modules/os_security_group_rule.py +++ b/plugins/modules/os_security_group_rule.py @@ -4,8 +4,6 @@ # Copyright (c) 2013, Benno Joy # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_server.py b/plugins/modules/os_server.py index 2fd8285d..7ec3c7ce 100644 --- a/plugins/modules/os_server.py +++ b/plugins/modules/os_server.py @@ -7,8 +7,6 @@ # Copyright (c) 2013, John Dewey # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_server_action.py b/plugins/modules/os_server_action.py index 8d30df4f..336ffab8 100644 --- a/plugins/modules/os_server_action.py +++ b/plugins/modules/os_server_action.py @@ -4,8 +4,6 @@ # Copyright (c) 2015, Jesse Keating # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_server_group.py b/plugins/modules/os_server_group.py index 98155301..43be97b2 100644 --- a/plugins/modules/os_server_group.py +++ b/plugins/modules/os_server_group.py @@ -3,8 +3,6 @@ # Copyright (c) 2016 Catalyst IT Limited # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_server_info.py b/plugins/modules/os_server_info.py index 0658c8d1..ba8bc03d 100644 --- a/plugins/modules/os_server_info.py +++ b/plugins/modules/os_server_info.py @@ -3,8 +3,6 @@ # Copyright (c) 2014 Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_server_metadata.py b/plugins/modules/os_server_metadata.py index 5d68f894..907d9c73 100644 --- a/plugins/modules/os_server_metadata.py +++ b/plugins/modules/os_server_metadata.py @@ -4,8 +4,6 @@ # Copyright (c) 2016, Mario Santos # 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 - ANSIBLE_METADATA = {'status': ['preview'], 'supported_by': 'community', diff --git a/plugins/modules/os_server_volume.py b/plugins/modules/os_server_volume.py index 89468bc3..d23f1081 100644 --- a/plugins/modules/os_server_volume.py +++ b/plugins/modules/os_server_volume.py @@ -4,8 +4,6 @@ # Copyright (c) 2014 Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_stack.py b/plugins/modules/os_stack.py index a6d3f250..406ff278 100644 --- a/plugins/modules/os_stack.py +++ b/plugins/modules/os_stack.py @@ -5,8 +5,6 @@ # (c) 2016, Steve Baker # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_subnet.py b/plugins/modules/os_subnet.py index 213b3680..95c61752 100644 --- a/plugins/modules/os_subnet.py +++ b/plugins/modules/os_subnet.py @@ -4,8 +4,6 @@ # (c) 2013, Benno Joy # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_subnets_info.py b/plugins/modules/os_subnets_info.py index b7666a80..40b93c89 100644 --- a/plugins/modules/os_subnets_info.py +++ b/plugins/modules/os_subnets_info.py @@ -3,8 +3,6 @@ # Copyright (c) 2015 Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_user.py b/plugins/modules/os_user.py index f28257ec..c4e4f0ac 100644 --- a/plugins/modules/os_user.py +++ b/plugins/modules/os_user.py @@ -2,8 +2,6 @@ # Copyright (c) 2015 Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_user_group.py b/plugins/modules/os_user_group.py index ae26d0ae..4f38fb7c 100644 --- a/plugins/modules/os_user_group.py +++ b/plugins/modules/os_user_group.py @@ -2,8 +2,6 @@ # Copyright (c) 2015 Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_user_info.py b/plugins/modules/os_user_info.py index 2ed61197..6ecae665 100644 --- a/plugins/modules/os_user_info.py +++ b/plugins/modules/os_user_info.py @@ -2,8 +2,6 @@ # Copyright (c) 2016 Hewlett-Packard Enterprise Corporation # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_user_role.py b/plugins/modules/os_user_role.py index 2ba30ecd..d7c6c9b4 100644 --- a/plugins/modules/os_user_role.py +++ b/plugins/modules/os_user_role.py @@ -2,8 +2,6 @@ # Copyright (c) 2016 IBM # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_volume.py b/plugins/modules/os_volume.py index 44c589a7..f40cb738 100644 --- a/plugins/modules/os_volume.py +++ b/plugins/modules/os_volume.py @@ -3,8 +3,6 @@ # Copyright (c) 2014 Hewlett-Packard Development Company, L.P. # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/plugins/modules/os_volume_snapshot.py b/plugins/modules/os_volume_snapshot.py index 307d0def..38a58552 100644 --- a/plugins/modules/os_volume_snapshot.py +++ b/plugins/modules/os_volume_snapshot.py @@ -4,8 +4,6 @@ # Copyright (c) 2016, Mario Santos # 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 - ANSIBLE_METADATA = {'status': ['preview'], 'supported_by': 'community', diff --git a/plugins/modules/os_zone.py b/plugins/modules/os_zone.py index f8135995..acbf4666 100644 --- a/plugins/modules/os_zone.py +++ b/plugins/modules/os_zone.py @@ -2,8 +2,6 @@ # Copyright (c) 2016 Hewlett-Packard Enterprise # 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 - ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ['preview'], diff --git a/tests/unit/compat/builtins.py b/tests/unit/compat/builtins.py index 0c0c170e..aadb9cdb 100644 --- a/tests/unit/compat/builtins.py +++ b/tests/unit/compat/builtins.py @@ -16,7 +16,6 @@ # along with Ansible. If not, see . # Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) # # Compat for python2.7 diff --git a/tests/unit/compat/mock.py b/tests/unit/compat/mock.py index fcefbbe0..382ab2f4 100644 --- a/tests/unit/compat/mock.py +++ b/tests/unit/compat/mock.py @@ -16,7 +16,6 @@ # along with Ansible. If not, see . # Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) ''' Compat module for Python3.x's unittest.mock module diff --git a/tests/unit/compat/unittest.py b/tests/unit/compat/unittest.py index dcea29bb..30d8ab53 100644 --- a/tests/unit/compat/unittest.py +++ b/tests/unit/compat/unittest.py @@ -16,7 +16,6 @@ # along with Ansible. If not, see . # Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) ''' Compat module for Python2.7's unittest module diff --git a/tests/unit/mock/loader.py b/tests/unit/mock/loader.py index c46841cc..80d45ecd 100644 --- a/tests/unit/mock/loader.py +++ b/tests/unit/mock/loader.py @@ -16,7 +16,6 @@ # along with Ansible. If not, see . # Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) import os diff --git a/tests/unit/mock/procenv.py b/tests/unit/mock/procenv.py index 67965df4..48622b42 100644 --- a/tests/unit/mock/procenv.py +++ b/tests/unit/mock/procenv.py @@ -17,7 +17,6 @@ # along with Ansible. If not, see . # Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) import sys import json diff --git a/tests/unit/mock/vault_helper.py b/tests/unit/mock/vault_helper.py index b90f49fa..ac5d0689 100644 --- a/tests/unit/mock/vault_helper.py +++ b/tests/unit/mock/vault_helper.py @@ -12,7 +12,6 @@ # along with Ansible. If not, see . # Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) from ansible.module_utils._text import to_bytes diff --git a/tests/unit/modules/cloud/openstack/test_os_routers_info.py b/tests/unit/modules/cloud/openstack/test_os_routers_info.py index 0753bcab..39734b8f 100644 --- a/tests/unit/modules/cloud/openstack/test_os_routers_info.py +++ b/tests/unit/modules/cloud/openstack/test_os_routers_info.py @@ -1,4 +1,3 @@ -from __future__ import (absolute_import, division, print_function) import munch diff --git a/tests/unit/plugins/inventory/test_openstack.py b/tests/unit/plugins/inventory/test_openstack.py index 2ec20c3f..2232ca9a 100644 --- a/tests/unit/plugins/inventory/test_openstack.py +++ b/tests/unit/plugins/inventory/test_openstack.py @@ -18,7 +18,6 @@ # along with Ansible. If not, see . # Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) import pytest diff --git a/tools/build.py b/tools/build.py index e8b6e0da..e3986301 100755 --- a/tools/build.py +++ b/tools/build.py @@ -13,10 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -# The next line is pointless for this file, but the collection -# linter freaks out if they are not there. -from __future__ import absolute_import, division, print_function - import pbr.version from ruamel.yaml import YAML