From 17d88b08280075e6b27e70a71c010595cf56eca2 Mon Sep 17 00:00:00 2001 From: Daniel Speichert Date: Tue, 6 Jun 2017 00:10:13 -0400 Subject: [PATCH] Fix py3 compatibility (dict.iteritems()) in object_store Change-Id: I50900ba74d8e3d1d913871f33921eb1111a1d983 Closes-Bug:#1696040 --- openstack/object_store/v1/obj.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openstack/object_store/v1/obj.py b/openstack/object_store/v1/obj.py index 1b93e8e84..c0fac8c6a 100644 --- a/openstack/object_store/v1/obj.py +++ b/openstack/object_store/v1/obj.py @@ -12,6 +12,7 @@ # under the License. import copy +import six from openstack.object_store import object_store_service from openstack.object_store.v1 import _base @@ -167,7 +168,7 @@ class Object(_base.BaseResource): # Filter out items with empty values so the create metadata behaviour # is the same as account and container filtered_metadata = \ - {key: value for key, value in metadata.iteritems() if value} + {key: value for key, value in six.iteritems(metadata) if value} # Get a copy of the original metadata so it doesn't get erased on POST # and update it with the new metadata values.