openstack
/
oslo.versionedobjects
Code Issues Proposed changes

Merge "Replace six.iteritems() with .items()"

This commit is contained in:
Jenkins 2017-01-02 21:26:37 +00:00 committed by Gerrit Code Review
parent 542e5b592a 49f5a9b00a
commit 1d1932400d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oslo_versionedobjects/base.py
View File

@ -56,7 +56,7 @@ def _make_class_properties(cls):
for name, field in supercls.fields.items():
if name not in cls.fields:
cls.fields[name] = field
for name, field in six.iteritems(cls.fields):
for name, field in cls.fields.items():
if not isinstance(field, obj_fields.Field):
raise exception.ObjectFieldInvalid(
field=name, objname=cls.obj_name())
@ -208,7 +208,7 @@ def remotable(fn):
if self.indirection_api:
updates, result = self.indirection_api.object_action(
ctxt, self, fn.__name__, args, kwargs)
for key, value in six.iteritems(updates):
for key, value in updates.items():
if key in self.fields:
field = self.fields[key]
# NOTE(ndipanov): Since VersionedObjectSerializer will have
@ -933,7 +933,7 @@ class VersionedObjectSerializer(messaging.NoOpSerializer):
iterable = values.__class__
if issubclass(iterable, dict):
return iterable([(k, action_fn(context, v))
for k, v in six.iteritems(values)])
for k, v in values.items()])
else:
# NOTE(danms, gibi) A set can't have an unhashable value inside,
# such as a dict. Convert the set to list, which is fine, since we

6
oslo_versionedobjects/fields.py
View File

@ -711,14 +711,14 @@ class DictProxyField(object):
if getattr(obj, self._fld_name) is None:
return
return {self._key_type(k): v
for k, v in six.iteritems(getattr(obj, self._fld_name))}
for k, v in getattr(obj, self._fld_name).items()}
def __set__(self, obj, val):
if val is None:
setattr(obj, self._fld_name, val)
else:
setattr(obj, self._fld_name,
{six.text_type(k): v for k, v in six.iteritems(val)})
{six.text_type(k): v for k, v in val.items()})
class Set(CompoundFieldType):
@ -1266,7 +1266,7 @@ class CoercedDict(CoercedCollectionMixin, dict):
def _coerce_dict(self, d):
res = {}
for key, element in six.iteritems(d):
for key, element in d.items():
res[key] = self._coerce_item(key, element)
return res

2
oslo_versionedobjects/fixture.py
View File

@ -124,7 +124,7 @@ class FakeIndirectionAPI(base.VersionedObjectIndirectionAPI):
kwargs = dict(
[(argname, self._ser.deserialize_entity(
context, self._ser.serialize_entity(context, arg)))
for argname, arg in six.iteritems(kwargs)])
for argname, arg in kwargs.items()])
return args, kwargs
def object_action(self, context, objinst, objmethod, args, kwargs):