From c4063c0571ac6844a255fde1288e3aae47cd2e16 Mon Sep 17 00:00:00 2001 From: lx <1120722567@qq.com> Date: Mon, 30 Sep 2019 17:20:46 +0800 Subject: [PATCH] update provider code to python3 --- contrib/inventory/alicloud.py | 12 ++++-------- lib/ansible/modules/cloud/alicloud/ali_disk_facts.py | 2 +- lib/ansible/modules/cloud/alicloud/ali_eip.py | 2 +- lib/ansible/modules/cloud/alicloud/ali_eip_facts.py | 4 ++-- lib/ansible/modules/cloud/alicloud/ali_eni.py | 6 +++--- lib/ansible/modules/cloud/alicloud/ali_eni_facts.py | 4 ++-- .../modules/cloud/alicloud/ali_ess_configuration.py | 2 +- lib/ansible/modules/cloud/alicloud/ali_ess_group.py | 2 +- .../modules/cloud/alicloud/ali_ess_instance.py | 2 +- lib/ansible/modules/cloud/alicloud/ali_ess_rule.py | 2 +- lib/ansible/modules/cloud/alicloud/ali_ess_task.py | 2 +- .../modules/cloud/alicloud/ali_image_facts.py | 2 +- lib/ansible/modules/cloud/alicloud/ali_instance.py | 8 ++++---- .../modules/cloud/alicloud/ali_instance_facts.py | 4 ++-- .../modules/cloud/alicloud/ali_instance_info.py | 4 ++-- .../cloud/alicloud/ali_instance_type_facts.py | 2 +- .../modules/cloud/alicloud/ali_rds_account.py | 2 +- .../modules/cloud/alicloud/ali_rds_account_facts.py | 2 +- .../modules/cloud/alicloud/ali_rds_instance.py | 6 +++--- .../modules/cloud/alicloud/ali_rds_instance_facts.py | 2 +- .../modules/cloud/alicloud/ali_route_entry_facts.py | 2 +- .../modules/cloud/alicloud/ali_security_group.py | 2 +- .../cloud/alicloud/ali_security_group_facts.py | 4 ++-- lib/ansible/modules/cloud/alicloud/ali_slb_lb.py | 2 +- .../modules/cloud/alicloud/ali_slb_lb_facts.py | 4 ++-- .../modules/cloud/alicloud/ali_slb_listener.py | 2 +- .../modules/cloud/alicloud/ali_slb_listener_facts.py | 2 +- lib/ansible/modules/cloud/alicloud/ali_slb_server.py | 2 +- .../modules/cloud/alicloud/ali_slb_server_facts.py | 2 +- lib/ansible/modules/cloud/alicloud/ali_slb_vsg.py | 6 +++--- .../modules/cloud/alicloud/ali_slb_vsg_facts.py | 2 +- lib/ansible/modules/cloud/alicloud/ali_vpc.py | 2 +- lib/ansible/modules/cloud/alicloud/ali_vpc_facts.py | 4 ++-- lib/ansible/modules/cloud/alicloud/ali_vswitch.py | 2 +- .../modules/cloud/alicloud/ali_vswitch_facts.py | 4 ++-- setup.py | 11 +++++------ 36 files changed, 60 insertions(+), 65 deletions(-) diff --git a/contrib/inventory/alicloud.py b/contrib/inventory/alicloud.py index 85168e6b..6a541ac9 100755 --- a/contrib/inventory/alicloud.py +++ b/contrib/inventory/alicloud.py @@ -18,18 +18,14 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -import sys import os import argparse import re import yaml +import configparser from time import time from ansible.module_utils.alicloud_ecs import connect_to_acs -if sys.version_info >= (3, 0): - import configparser -else: - import ConfigParser as configparser try: import json @@ -127,7 +123,7 @@ def parse_cli_args(self): def read_settings(self): ''' Reads the settings from the alicloud.ini file ''' - config = configparser.SafeConfigParser() + config = configparser.ConfigParser() ecs_default_ini_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'alicloud.ini') ecs_ini_path = os.path.expanduser(os.path.expandvars(os.environ.get('ALICLOUD_INI_PATH', ecs_default_ini_path))) @@ -394,9 +390,9 @@ def add_instance(self, instance, region): # Inventory: Group by tag keys if self.group_by_tag_keys: - for k, v in instance.tags.items(): + for k, v in list(instance.tags.items()): if self.expand_csv_tags and v and ',' in v: - values = map(lambda x: x.strip(), v.split(',')) + values = [x.strip() for x in v.split(',')] else: values = [v] diff --git a/lib/ansible/modules/cloud/alicloud/ali_disk_facts.py b/lib/ansible/modules/cloud/alicloud/ali_disk_facts.py index 003753cb..d5065ec1 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_disk_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_disk_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_eip.py b/lib/ansible/modules/cloud/alicloud/ali_eip.py index a7ee3b4d..4337cca8 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_eip.py +++ b/lib/ansible/modules/cloud/alicloud/ali_eip.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_eip_facts.py b/lib/ansible/modules/cloud/alicloud/ali_eip_facts.py index b77f10da..8dad6ab5 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_eip_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_eip_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', @@ -202,7 +202,7 @@ def main(): if not filters: filters = {} new_filters = {} - for key, value in filters.items(): + for key, value in list(filters.items()): if str(key).lower().replace("-").replace("_") == "allocationid" and value not in eip_ids: eip_ids.append(value) continue diff --git a/lib/ansible/modules/cloud/alicloud/ali_eni.py b/lib/ansible/modules/cloud/alicloud/ali_eni.py index ac84af2d..e6553f6a 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_eni.py +++ b/lib/ansible/modules/cloud/alicloud/ali_eni.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', @@ -338,8 +338,8 @@ def main(): if not tags: removed = eni.tags else: - for key, value in eni.tags.items(): - if key not in tags.keys(): + for key, value in list(eni.tags.items()): + if key not in list(tags.keys()): removed[key] = value try: if eni.remove_tags(removed): diff --git a/lib/ansible/modules/cloud/alicloud/ali_eni_facts.py b/lib/ansible/modules/cloud/alicloud/ali_eni_facts.py index b8729b98..8ac4fb16 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_eni_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_eni_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', @@ -203,7 +203,7 @@ def main(): eni_ids = module.params["eni_ids"] if not eni_ids: eni_ids = [] - for key, value in filters.items(): + for key, value in list(filters.items()): if str(key).startswith("NetworkInterfaceId") or \ str(key).startswith("network_interface_id") or \ str(key).startswith("network-interface-id"): diff --git a/lib/ansible/modules/cloud/alicloud/ali_ess_configuration.py b/lib/ansible/modules/cloud/alicloud/ali_ess_configuration.py index 1f9708d5..55491d84 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_ess_configuration.py +++ b/lib/ansible/modules/cloud/alicloud/ali_ess_configuration.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_ess_group.py b/lib/ansible/modules/cloud/alicloud/ali_ess_group.py index f2d5341b..36dfa527 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_ess_group.py +++ b/lib/ansible/modules/cloud/alicloud/ali_ess_group.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_ess_instance.py b/lib/ansible/modules/cloud/alicloud/ali_ess_instance.py index 1fd1779b..c456f701 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_ess_instance.py +++ b/lib/ansible/modules/cloud/alicloud/ali_ess_instance.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_ess_rule.py b/lib/ansible/modules/cloud/alicloud/ali_ess_rule.py index 8264e884..a1c1b668 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_ess_rule.py +++ b/lib/ansible/modules/cloud/alicloud/ali_ess_rule.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_ess_task.py b/lib/ansible/modules/cloud/alicloud/ali_ess_task.py index 8e592af5..d64028ff 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_ess_task.py +++ b/lib/ansible/modules/cloud/alicloud/ali_ess_task.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_image_facts.py b/lib/ansible/modules/cloud/alicloud/ali_image_facts.py index 40e1a577..40f533a3 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_image_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_image_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_instance.py b/lib/ansible/modules/cloud/alicloud/ali_instance.py index 82628317..84aa77cc 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_instance.py +++ b/lib/ansible/modules/cloud/alicloud/ali_instance.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', @@ -630,7 +630,7 @@ def modify_instance(module, instance): setattr(instance, "user_data", instance.describe_user_data()) user_data = instance.user_data if state == "stopped": - user_data = module.params['user_data'] + user_data = module.params['user_data'].encode() try: return instance.modify(name=name, description=description, host_name=host_name, password=password, user_data=user_data) @@ -849,8 +849,8 @@ def main(): if not tags: removed = inst.tags else: - for key, value in inst.tags.items(): - if key not in tags.keys(): + for key, value in list(inst.tags.items()): + if key not in list(tags.keys()): removed[key] = value try: if inst.remove_tags(removed): diff --git a/lib/ansible/modules/cloud/alicloud/ali_instance_facts.py b/lib/ansible/modules/cloud/alicloud/ali_instance_facts.py index 5af15b5d..31013a99 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_instance_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_instance_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', @@ -397,7 +397,7 @@ def main(): filters = {} if not ids: ids = [] - for key, value in filters.items(): + for key, value in list(filters.items()): if key in ["InstanceIds", "instance_ids", "instance-ids"] and isinstance(ids, list): for id in value: if id not in ids: diff --git a/lib/ansible/modules/cloud/alicloud/ali_instance_info.py b/lib/ansible/modules/cloud/alicloud/ali_instance_info.py index a23b9d14..1c6e5252 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_instance_info.py +++ b/lib/ansible/modules/cloud/alicloud/ali_instance_info.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', @@ -400,7 +400,7 @@ def main(): filters = {} if not ids: ids = [] - for key, value in filters.items(): + for key, value in list(filters.items()): if key in ["InstanceIds", "instance_ids", "instance-ids"] and isinstance(ids, list): for id in value: if id not in ids: diff --git a/lib/ansible/modules/cloud/alicloud/ali_instance_type_facts.py b/lib/ansible/modules/cloud/alicloud/ali_instance_type_facts.py index d31c1729..3e5d8136 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_instance_type_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_instance_type_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_rds_account.py b/lib/ansible/modules/cloud/alicloud/ali_rds_account.py index cdde92dc..be501593 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_rds_account.py +++ b/lib/ansible/modules/cloud/alicloud/ali_rds_account.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_rds_account_facts.py b/lib/ansible/modules/cloud/alicloud/ali_rds_account_facts.py index cb5c8192..10ee5279 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_rds_account_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_rds_account_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_rds_instance.py b/lib/ansible/modules/cloud/alicloud/ali_rds_instance.py index c986bff7..f21dc9a0 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_rds_instance.py +++ b/lib/ansible/modules/cloud/alicloud/ali_rds_instance.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', @@ -367,7 +367,7 @@ def main(): description=dict(type='str', aliases=['db_instance_description']), security_ips=dict(type='str'), instance_charge_type=dict(type='str', choices=["Postpaid", "Prepaid"]), - period=dict(type='int', choices=range(1, 10).extend([12, 24, 36])), + period=dict(type='int', choices=list(range(1, 10)).extend([12, 24, 36])), connection_mode=dict(type='str', choices=["Performance", "Safty"]), vpc_id=dict(type='str'), vswitch_id=dict(type='str'), @@ -383,7 +383,7 @@ def main(): dest_connection_string_prefix=dict(type='str'), dest_port=dict(type='str'), public_port=dict(type='str'), - private_port=dict(type='int', choices=range(3001, 4000)), + private_port=dict(type='int', choices=list(range(3001, 4000))), current_connection_string=dict(type='str'), instance_type=dict(type='str', aliases=['db_instance_class']), instance_storage=dict(type='int', aliases=['db_instance_storage']) diff --git a/lib/ansible/modules/cloud/alicloud/ali_rds_instance_facts.py b/lib/ansible/modules/cloud/alicloud/ali_rds_instance_facts.py index 2dddc041..7dfaf3c0 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_rds_instance_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_rds_instance_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_route_entry_facts.py b/lib/ansible/modules/cloud/alicloud/ali_route_entry_facts.py index ea5aa3a6..5beab126 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_route_entry_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_route_entry_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_security_group.py b/lib/ansible/modules/cloud/alicloud/ali_security_group.py index 32f7b923..bfc83abe 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_security_group.py +++ b/lib/ansible/modules/cloud/alicloud/ali_security_group.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_security_group_facts.py b/lib/ansible/modules/cloud/alicloud/ali_security_group_facts.py index ccd27661..6508b916 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_security_group_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_security_group_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', @@ -221,7 +221,7 @@ def main(): group_ids = module.params['group_ids'] if not group_ids: group_ids = [] - for key, value in filters.items(): + for key, value in list(filters.items()): if key in ["SecurityGroupIds", "security_group_ids", "security_group_ids"] and isinstance(group_ids, list): for id in value: if id not in group_ids: diff --git a/lib/ansible/modules/cloud/alicloud/ali_slb_lb.py b/lib/ansible/modules/cloud/alicloud/ali_slb_lb.py index b511aa9a..0d89e494 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_slb_lb.py +++ b/lib/ansible/modules/cloud/alicloud/ali_slb_lb.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_slb_lb_facts.py b/lib/ansible/modules/cloud/alicloud/ali_slb_lb_facts.py index 7d6c2b6e..73e06db5 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_slb_lb_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_slb_lb_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', @@ -278,7 +278,7 @@ def main(): filters = module.params['filters'] if not filters: filters = {} - for key, value in filters.items(): + for key, value in list(filters.items()): if key in ["LoadBalancerId", "load-balancer-id", "load_balancer_id"] and value not in lb_ids: lb_ids.append(value) lbs = [] diff --git a/lib/ansible/modules/cloud/alicloud/ali_slb_listener.py b/lib/ansible/modules/cloud/alicloud/ali_slb_listener.py index b4a32eb2..41c05e42 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_slb_listener.py +++ b/lib/ansible/modules/cloud/alicloud/ali_slb_listener.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_slb_listener_facts.py b/lib/ansible/modules/cloud/alicloud/ali_slb_listener_facts.py index d894c7cc..6aed0081 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_slb_listener_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_slb_listener_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_slb_server.py b/lib/ansible/modules/cloud/alicloud/ali_slb_server.py index 4006959f..05e9df75 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_slb_server.py +++ b/lib/ansible/modules/cloud/alicloud/ali_slb_server.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_slb_server_facts.py b/lib/ansible/modules/cloud/alicloud/ali_slb_server_facts.py index 1396839e..1cc8258a 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_slb_server_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_slb_server_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_slb_vsg.py b/lib/ansible/modules/cloud/alicloud/ali_slb_vsg.py index 8f794774..676250ce 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_slb_vsg.py +++ b/lib/ansible/modules/cloud/alicloud/ali_slb_vsg.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', @@ -210,7 +210,7 @@ def check_backend_servers(module, servers): for s in servers: - for key in s.keys(): + for key in list(s.keys()): if key not in VALID_SERVER_PARAMS: module.fail_json(msg='Invalid backend server key {0}. Valid keys: {1}.'.format(key, VALID_SERVER_PARAMS)) @@ -220,7 +220,7 @@ def format_backend_servers(servers): if servers: for s in servers: server = {} - for key, value in s.items(): + for key, value in list(s.items()): split = [] for k in str(key).split("_"): split.append(str.upper(k[0]) + k[1:]) diff --git a/lib/ansible/modules/cloud/alicloud/ali_slb_vsg_facts.py b/lib/ansible/modules/cloud/alicloud/ali_slb_vsg_facts.py index fed8ab39..4d31d8cb 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_slb_vsg_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_slb_vsg_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_vpc.py b/lib/ansible/modules/cloud/alicloud/ali_vpc.py index e9880eb8..6408b67c 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_vpc.py +++ b/lib/ansible/modules/cloud/alicloud/ali_vpc.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_vpc_facts.py b/lib/ansible/modules/cloud/alicloud/ali_vpc_facts.py index 8861791e..5d82e5fc 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_vpc_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_vpc_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', @@ -193,7 +193,7 @@ def main(): vpc_ids = module.params['vpc_ids'] if not vpc_ids: vpc_ids = [] - for key, value in filters.items(): + for key, value in list(filters.items()): if key in ["VpcId", "vpc_id", "vpc-id"] and value not in vpc_ids: vpc_ids.append(value) diff --git a/lib/ansible/modules/cloud/alicloud/ali_vswitch.py b/lib/ansible/modules/cloud/alicloud/ali_vswitch.py index a5f4203c..f5a46e95 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_vswitch.py +++ b/lib/ansible/modules/cloud/alicloud/ali_vswitch.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', diff --git a/lib/ansible/modules/cloud/alicloud/ali_vswitch_facts.py b/lib/ansible/modules/cloud/alicloud/ali_vswitch_facts.py index 01869d0a..c302bcea 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_vswitch_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_vswitch_facts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see http://www.gnu.org/licenses/. -from __future__ import absolute_import, division, print_function + __metaclass__ = type ANSIBLE_METADATA = {'metadata_version': '1.1', @@ -198,7 +198,7 @@ def main(): vswitch_ids = module.params['vswitch_ids'] if not vswitch_ids: vswitch_ids = [] - for key, value in filters.items(): + for key, value in list(filters.items()): if key in ["VSwitchId", "vswitch_id", "vswitch-id"] and value not in vswitch_ids: vswitch_ids.append(value) diff --git a/setup.py b/setup.py index 6d587c48..ea66837f 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ AUTHOR_EMAIL = "heguimin36@163.com" URL = "https://github.com/alibaba/ansible-provider/tree/master/lib/ansible" -VERSION = "1.10.0" +VERSION = "1.11.0" setup( name=NAME, @@ -51,14 +51,13 @@ 'License :: OSI Approved :: MIT License', # Specify the Python versions you support here. In particular, ensure - # that you indicate whether you support Python 2. - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', - 'Programming Language :: Python :: 2.7', + # that you indicate whether you support Python 3. + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.6', ], package_dir={'': 'lib'}, packages=find_packages('lib'), include_package_data=True, - install_requires=['ansible', 'footmark>=1.12.0', 'importlib'] + install_requires=['ansible', 'footmark>=1.13.0'] )