diff options
Diffstat (limited to 'base/common/python/pki')
| -rw-r--r-- | base/common/python/pki/encoder.py | 5 | ||||
| -rw-r--r-- | base/common/python/pki/system.py | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/base/common/python/pki/encoder.py b/base/common/python/pki/encoder.py index 7b621f290..1af0feaad 100644 --- a/base/common/python/pki/encoder.py +++ b/base/common/python/pki/encoder.py @@ -36,8 +36,9 @@ class CustomTypeEncoder(json.JSONEncoder): for k, v in TYPES.items(): if isinstance(obj, v): return {k: obj.__dict__} - if type(obj) in NOTYPES.itervalues(): - return self.attr_name_conversion(obj.__dict__, type(obj)) + for t in NOTYPES.itervalues(): + if isinstance(obj, t): + return self.attr_name_conversion(obj.__dict__, type(obj)) return json.JSONEncoder.default(self, obj) @staticmethod diff --git a/base/common/python/pki/system.py b/base/common/python/pki/system.py index 24deefca4..76b505909 100644 --- a/base/common/python/pki/system.py +++ b/base/common/python/pki/system.py @@ -111,7 +111,7 @@ class SecurityDomainSubsystem(object): subsystem.name = json_value['@id'] hosts = json_value['Host'] - if type(hosts) is dict: + if isinstance(hosts, dict): hosts = [ hosts ] for h in hosts: @@ -154,7 +154,7 @@ class SecurityDomainInfo(object): security_domain.name = domain_info['@id'] subsystems = domain_info['Subsystem'] - if type(subsystems) is dict: + if isinstance(subsystems, dict): subsystems = [ subsystems ] for s in subsystems: |