aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJing Lu <lvjing5@huawei.com>2017-02-14 06:04:13 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-14 06:04:13 +0000
commitd292f1a4d00640ea6436d6d41eba5d03aea46a78 (patch)
tree756edb35fe716c8706051346fb8b98a59ebf4d40
parent13d09b66c8e2dba58056513093e71b77f255cc97 (diff)
parent6a24addcba949be6666e59a720c6860c6377d705 (diff)
Merge "vnfdgen: replace six.iteritems() with .items()"
-rw-r--r--yardstick/network_services/vnf_generic/vnfdgen.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/yardstick/network_services/vnf_generic/vnfdgen.py b/yardstick/network_services/vnf_generic/vnfdgen.py
index 9a02050a2..64554cdaf 100644
--- a/yardstick/network_services/vnf_generic/vnfdgen.py
+++ b/yardstick/network_services/vnf_generic/vnfdgen.py
@@ -16,7 +16,6 @@
from __future__ import absolute_import
import collections
import yaml
-import six
from yardstick.common.task_template import TaskTemplate
@@ -46,13 +45,14 @@ def dict_key_flatten(data):
"""
next_data = {}
+ # check for non-string iterables
if not any((isinstance(v, collections.Iterable) and not isinstance(v, str))
for v in data.values()):
return data
- for key, val in six.iteritems(data):
+ for key, val in data.items():
if isinstance(val, collections.Mapping):
- for n_k, n_v in six.iteritems(val):
+ for n_k, n_v in val.items():
next_data["%s.%s" % (key, n_k)] = n_v
elif isinstance(val, collections.Iterable) and not isinstance(val,
str):