diff options
Diffstat (limited to 'base/common/python/pki/key.py')
-rw-r--r-- | base/common/python/pki/key.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/base/common/python/pki/key.py b/base/common/python/pki/key.py index 8064ffc19..7b9a463a0 100644 --- a/base/common/python/pki/key.py +++ b/base/common/python/pki/key.py @@ -30,6 +30,8 @@ import base64 import json import urllib +from six import iteritems + import pki import pki.encoder as encoder @@ -70,7 +72,7 @@ class KeyData(object): def from_json(cls, attr_list): """ Return a KeyData object from a JSON dict """ key_data = cls() - for k, v in attr_list.iteritems(): + for k, v in iteritems(attr_list): if k in KeyData.json_attribute_names: setattr(key_data, KeyData.json_attribute_names[k], v) else: @@ -125,7 +127,7 @@ class KeyInfo(object): def from_json(cls, attr_list): """ Return KeyInfo from JSON dict """ key_info = cls() - for k, v in attr_list.iteritems(): + for k, v in iteritems(attr_list): if k in KeyInfo.json_attribute_names: setattr(key_info, KeyInfo.json_attribute_names[k], v) else: @@ -190,7 +192,7 @@ class KeyRequestInfo(object): def from_json(cls, attr_list): """ Return a KeyRequestInfo object from a JSON dict. """ key_request_info = cls() - for k, v in attr_list.iteritems(): + for k, v in iteritems(attr_list): if k in KeyRequestInfo.json_attribute_names: setattr(key_request_info, KeyRequestInfo.json_attribute_names[k], v) |