From a5802136cd4b518a01cd9c92446f0c64663e7d89 Mon Sep 17 00:00:00 2001 From: Kaspar Kask Date: Mon, 26 Feb 2018 17:09:44 +0200 Subject: [PATCH] Allow certificate to have empty policies list --- esteid/__init__.py | 2 +- esteid/digidocservice/models.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/esteid/__init__.py b/esteid/__init__.py index daab838..09964d6 100644 --- a/esteid/__init__.py +++ b/esteid/__init__.py @@ -1 +1 @@ -__version__ = '1.2.4' +__version__ = '1.2.5' diff --git a/esteid/digidocservice/models.py b/esteid/digidocservice/models.py index 3bee6ba..f0c64ee 100644 --- a/esteid/digidocservice/models.py +++ b/esteid/digidocservice/models.py @@ -59,9 +59,9 @@ def camel_2_py(cls, the_dict): return new_dict @classmethod - def ensure_instance(cls, model, the_data, allow_list=False, allow_none=False): + def ensure_instance(cls, model, the_data, allow_list=False, allow_none=False, default=None): if the_data is None and allow_none: - return None + return default if not isinstance(the_data, model): if isinstance(the_data, SudsObject): @@ -125,14 +125,18 @@ def __init__(self, oid, url=None, description=None): class Certificate(BaseDigidocServiceObject): - def __init__(self, valid_from, issuer_serial, issuer, valid_to, subject, policies): + def __init__(self, valid_from, issuer_serial, issuer, valid_to, subject, policies=None): self.valid_from = valid_from self.issuer_serial = issuer_serial self.issuer = issuer self.valid_to = valid_to self.subject = subject - self.policies = BaseDigidocServiceObject.ensure_instance(CertificatePolicy, policies, allow_list=True) + self.policies = BaseDigidocServiceObject.ensure_instance(CertificatePolicy, + policies, + allow_list=True, + allow_none=True, + default=list()) class Signer(BaseDigidocServiceObject):