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/v1 | |
| parent | e3ba7960c2a48f35f4474277a13b35e9f2e7fd92 (diff) | |
| parent | 61aa092ce5cdee495e6faf63c36419e5583d3627 (diff) | |
| download | python-heatclient-81fb46dc4f1ede19936964b541d0dde083cb113e.tar.gz | |
Merge "Replace six.iteritems() with .items()"
Diffstat (limited to 'heatclient/v1')
| -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 |
4 files changed, 4 insertions, 8 deletions
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 |