From 654402bda778a268bc06ee9e37a420de5a2c9765 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Wed, 8 Jan 2014 16:24:59 +0100 Subject: [PATCH] Python 3: use six.iteritems() instead of iteritems() Six.iteritems() replaces dictionary.iteritems() on Python 2 and dictionary.items() on Python 3. Change-Id: I1588d92a9384497a65d1ea3530f8143e7953ed95 --- savannaclient/api/base.py | 7 ++++--- savannaclient/api/clusters.py | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/savannaclient/api/base.py b/savannaclient/api/base.py index d5b7deb3..d2979eb9 100644 --- a/savannaclient/api/base.py +++ b/savannaclient/api/base.py @@ -15,6 +15,7 @@ import json import logging +import six LOG = logging.getLogger(__name__) @@ -30,12 +31,12 @@ class Resource(object): self._add_details(info) def _set_defaults(self, info): - for name, value in self.defaults.iteritems(): + for name, value in six.iteritems(self.defaults): if name not in info: info[name] = value def _add_details(self, info): - for (k, v) in info.iteritems(): + for (k, v) in six.iteritems(info): try: setattr(self, k, v) self._info[k] = v @@ -64,7 +65,7 @@ class ResourceManager(object): return [i for i in self.list() if _check_items(i, kwargs.items())] def _copy_if_defined(self, data, **kwargs): - for var_name, var_value in kwargs.iteritems(): + for var_name, var_value in six.iteritems(kwargs): if var_value is not None: data[var_name] = var_value diff --git a/savannaclient/api/clusters.py b/savannaclient/api/clusters.py index cf248fc4..9668bd07 100644 --- a/savannaclient/api/clusters.py +++ b/savannaclient/api/clusters.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +import six + from savannaclient.api import base @@ -24,13 +26,13 @@ class ClusterManager(base.ResourceManager): resource_class = Cluster def _assert_variables(self, **kwargs): - for var_name, var_value in kwargs.iteritems(): + for var_name, var_value in six.iteritems(kwargs): if var_value is None: raise base.APIException('Cluster is missing field "%s"' % var_name) def _copy_if_defined(self, data, **kwargs): - for var_name, var_value in kwargs.iteritems(): + for var_name, var_value in six.iteritems(kwargs): if var_value is not None: data[var_name] = var_value