openstack/tacker
Code Issues Proposed changes

Remove six from sample scripts

Browse Source 
six is no longer needed since python 2 support was removed.

Change-Id: I87eef25a2e9f81aa6c6a31f4dcb9c900b8984162
This commit is contained in:
Takashi Kajinami
2024-05-07 11:25:25 +09:00
parent 7be3fdf2a7
commit db2dee07a3
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/mgmt_driver/ansible/ansible_config_parser.py
View File

@@ -13,7 +13,6 @@
import ast import ast
import datetime import datetime
import re import re
import six
import yaml import yaml
from heatclient import client as hclient from heatclient import client as hclient
@@ -146,7 +145,7 @@ class ConfigParser():
list_flag = True list_flag = True
elif isinstance(command, dict): elif isinstance(command, dict):
dict_flag = True dict_flag = True
elif not isinstance(command, six.string_types): elif not isinstance(command, str):
raise Exception( raise Exception(
"Value '{}' of type '{}' is not yet supported " "Value '{}' of type '{}' is not yet supported "
" for parameter substitution." " for parameter substitution."
@@ -365,7 +364,7 @@ class ConfigParser():
# apply filters # apply filters
if isinstance(items, dict): if isinstance(items, dict):
raw_result = dict(filter(filter_func, items.items())) raw_result = dict(filter(filter_func, items.items()))
elif isinstance(items, six.string_types): elif isinstance(items, str):
# check if instance is string dict, else return as string, # check if instance is string dict, else return as string,
# since item is a single value # since item is a single value
try: try:
@@ -459,7 +458,7 @@ class ConfigHandle():
res = res + "{}".format(item) res = res + "{}".format(item)
else: else:
res = res + ",{}".format(item) res = res + ",{}".format(item)
elif isinstance(items, six.string_types): elif isinstance(items, str):
res = items res = items
else: else:
raise Exception( raise Exception(

3
samples/mgmt_driver/ansible/config_actions/vm_app_config/ansible_playbook_exec.py
View File

@@ -14,7 +14,6 @@ import json
import os import os
from oslo_log import log as logging from oslo_log import log as logging
from six import iteritems
from tacker.vnfm.mgmt_drivers.ansible import event_handler from tacker.vnfm.mgmt_drivers.ansible import event_handler
from tacker.vnfm.mgmt_drivers.ansible import exceptions from tacker.vnfm.mgmt_drivers.ansible import exceptions
@@ -73,7 +72,7 @@ class AnsiblePlaybookExecutor(executor.Executor):
params = "" params = ""
obj_params = playbook_cmd.get("params", "") obj_params = playbook_cmd.get("params", "")
if obj_params: if obj_params:
for key, value in iteritems(obj_params): for key, value in obj_params.items():
if isinstance(value, dict): if isinstance(value, dict):
str_value = json.dumps( str_value = json.dumps(
value, separators=(',', ':')).replace('"', '\\"') value, separators=(',', ':')).replace('"', '\\"')