From db00ea3bee6b86ae662cfdb8b50cca4a8be82ef1 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Wed, 19 Feb 2014 14:37:44 -0500 Subject: Fix minor issues from review. 1. main function in SymKeyGenerationRequest does not use correct usages 2. from_dict -> from_json() for consistency --- base/common/python/pki/cert.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'base/common/python/pki/cert.py') diff --git a/base/common/python/pki/cert.py b/base/common/python/pki/cert.py index 0a720a5e1..3d05df0c3 100644 --- a/base/common/python/pki/cert.py +++ b/base/common/python/pki/cert.py @@ -35,7 +35,7 @@ class CertData(object): self.Encoded = None @classmethod - def from_dict(cls, attr_list): + def from_json(cls, attr_list): ''' Return CertData object from JSON dict ''' cert_data = cls() for key in attr_list: @@ -63,7 +63,7 @@ class CertDataInfo(object): self.issuedBy = None @classmethod - def from_dict(cls, attr_list): + def from_json(cls, attr_list): ''' Return CertDataInfo object from JSON dict ''' cert_data_info = cls() for key in attr_list: @@ -87,10 +87,10 @@ class CertDataInfos(object): ret = cls() cert_infos = json_value['CertDataInfo'] if not isinstance(cert_infos, types.ListType): - ret.certInfoList.append(CertDataInfo.from_dict(cert_infos)) + ret.certInfoList.append(CertDataInfo.from_json(cert_infos)) else: for cert_info in cert_infos: - ret.certInfoList.append(CertDataInfo.from_dict(cert_info)) + ret.certInfoList.append(CertDataInfo.from_json(cert_info)) return ret class CertSearchRequest(object): -- cgit