diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-12 09:06:53 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-12 09:06:53 +0000 |
commit | 81fb46dc4f1ede19936964b541d0dde083cb113e (patch) | |
tree | 5d56abb0a079c8f152317a5189121129f78feec0 /heatclient | |
parent | e3ba7960c2a48f35f4474277a13b35e9f2e7fd92 (diff) | |
parent | 61aa092ce5cdee495e6faf63c36419e5583d3627 (diff) | |
download | python-heatclient-81fb46dc4f1ede19936964b541d0dde083cb113e.tar.gz |
Merge "Replace six.iteritems() with .items()"
Diffstat (limited to 'heatclient')
-rw-r--r-- | heatclient/common/base.py | 4 | ||||
-rw-r--r-- | heatclient/common/template_utils.py | 4 | ||||
-rw-r--r-- | heatclient/common/utils.py | 2 | ||||
-rw-r--r-- | heatclient/tests/functional/osc/v1/base.py | 4 | ||||
-rw-r--r-- | heatclient/v1/events.py | 3 | ||||
-rw-r--r-- | heatclient/v1/resources.py | 3 | ||||
-rw-r--r-- | heatclient/v1/software_configs.py | 3 | ||||
-rw-r--r-- | heatclient/v1/stacks.py | 3 |
8 files changed, 11 insertions, 15 deletions
diff --git a/heatclient/common/base.py b/heatclient/common/base.py index f631603..cca6a43 100644 --- a/heatclient/common/base.py +++ b/heatclient/common/base.py @@ -293,7 +293,7 @@ class CrudManager(BaseManager): def _filter_kwargs(self, kwargs): """Drop null values and handle ids.""" - for key, ref in six.iteritems(kwargs.copy()): + for key, ref in kwargs.copy().items(): if ref is None: kwargs.pop(key) else: @@ -451,7 +451,7 @@ class Resource(object): return None def _add_details(self, info): - for (k, v) in six.iteritems(info): + for (k, v) in info.items(): try: setattr(self, k, v) self._info[k] = v diff --git a/heatclient/common/template_utils.py b/heatclient/common/template_utils.py index c81da43..9e9c85b 100644 --- a/heatclient/common/template_utils.py +++ b/heatclient/common/template_utils.py @@ -144,7 +144,7 @@ def get_file_contents(from_data, files, base_url=None, is_object, object_request) if isinstance(from_data, dict): - for key, value in six.iteritems(from_data): + for key, value in from_data.items(): if ignore_if and ignore_if(key, value): continue @@ -351,7 +351,7 @@ def resolve_environment_urls(resource_registry, files, env_base_url, get_file_contents(rr, files, base_url, ignore_if, is_object=is_object, object_request=object_request) - for res_name, res_dict in six.iteritems(rr.get('resources', {})): + for res_name, res_dict in rr.get('resources', {}).items(): res_base_url = res_dict.get('base_url', base_url) get_file_contents( res_dict, files, res_base_url, ignore_if, diff --git a/heatclient/common/utils.py b/heatclient/common/utils.py index 013e692..c9d1ec0 100644 --- a/heatclient/common/utils.py +++ b/heatclient/common/utils.py @@ -376,7 +376,7 @@ def format_parameter_file(param_files, template_file=None, template_file, template_url)) param_file = {} - for key, value in six.iteritems(params): + for key, value in params.items(): param_file[key] = resolve_param_get_file(value, template_base_url) return param_file diff --git a/heatclient/tests/functional/osc/v1/base.py b/heatclient/tests/functional/osc/v1/base.py index 31a9cd7..b17fb4c 100644 --- a/heatclient/tests/functional/osc/v1/base.py +++ b/heatclient/tests/functional/osc/v1/base.py @@ -48,7 +48,7 @@ class OpenStackClientTestBase(base.ClientTestBase): items = self.parser.listing(output) for item in items: obj[item['Field']] = six.text_type(item['Value']) - return dict((self._key_name(k), v) for k, v in six.iteritems(obj)) + return dict((self._key_name(k), v) for k, v in obj.items()) def _key_name(self, key): return key.lower().replace(' ', '_') @@ -60,7 +60,7 @@ class OpenStackClientTestBase(base.ClientTestBase): if item['ID'] == id: obj = item break - return dict((self._key_name(k), v) for k, v in six.iteritems(obj)) + return dict((self._key_name(k), v) for k, v in obj.items()) def _stack_create(self, name, template, parameters=[], wait=True): cmd = 'stack create ' + name diff --git a/heatclient/v1/events.py b/heatclient/v1/events.py index fd5a571..651ce9f 100644 --- a/heatclient/v1/events.py +++ b/heatclient/v1/events.py @@ -15,7 +15,6 @@ import collections from oslo_utils import encodeutils -import six from six.moves.urllib import parse from heatclient.common import base @@ -54,7 +53,7 @@ class EventManager(stacks.StackChildManager): filters = kwargs.pop('filters') params.update(filters) - for key, value in six.iteritems(kwargs): + for key, value in kwargs.items(): if value: params[key] = value diff --git a/heatclient/v1/resources.py b/heatclient/v1/resources.py index 85b743c..b82b778 100644 --- a/heatclient/v1/resources.py +++ b/heatclient/v1/resources.py @@ -14,7 +14,6 @@ # under the License. from oslo_utils import encodeutils -import six from six.moves.urllib import parse from heatclient.common import base @@ -60,7 +59,7 @@ class ResourceManager(stacks.StackChildManager): filters = kwargs.pop('filters') params.update(filters) - for key, value in six.iteritems(kwargs): + for key, value in kwargs.items(): if value: params[key] = value diff --git a/heatclient/v1/software_configs.py b/heatclient/v1/software_configs.py index 79fbddd..8d5c9e1 100644 --- a/heatclient/v1/software_configs.py +++ b/heatclient/v1/software_configs.py @@ -10,7 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -import six from six.moves.urllib import parse from heatclient.common import base @@ -38,7 +37,7 @@ class SoftwareConfigManager(base.BaseManager): """ qparams = {} - for opt, val in six.iteritems(kwargs): + for opt, val in kwargs.items(): if val: qparams[opt] = val diff --git a/heatclient/v1/stacks.py b/heatclient/v1/stacks.py index b6e6bf6..1a76286 100644 --- a/heatclient/v1/stacks.py +++ b/heatclient/v1/stacks.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import six from six.moves.urllib import parse from heatclient._i18n import _ @@ -151,7 +150,7 @@ class StackManager(StackChildManager): filters = kwargs.pop('filters') params.update(filters) - for key, value in six.iteritems(kwargs): + for key, value in kwargs.items(): if value: params[key] = value |