Solve some py3 compatibilty issues

1. replaced dict.keys() with six.iterkeys(dict)
2. replaced map with six.moves.map

Change-Id: I4b80e12a4686fd6f5857c2322de13b1245e72083
This commit is contained in:
Pradeep Kumar Singh
2015-07-24 11:28:50 +09:00
parent 97ae902a8d
commit 28715147df
4 changed files with 13 additions and 10 deletions

View File

@@ -20,6 +20,7 @@ import copy
import logging
import jsonschema
import six
LOG = logging.getLogger(__name__)
@@ -112,19 +113,19 @@ def model_factory(schema):
dict.update(self, other)
def iteritems(self):
return copy.deepcopy(dict(self)).iteritems()
return six.iteritems(copy.deepcopy(dict(self)))
def items(self):
return copy.deepcopy(dict(self)).items()
return list(six.iteritems(copy.deepcopy(dict(self))))
def itervalues(self):
return copy.deepcopy(dict(self)).itervalues()
return six.itervalues(copy.deepcopy(dict(self)))
def keys(self):
return copy.deepcopy(dict(self)).keys()
return list(six.iterkeys(copy.deepcopy(dict(self))))
def values(self):
return copy.deepcopy(dict(self)).values()
return list(six.itervalues(copy.deepcopy(dict(self))))
@property
def changes(self):