From 40786d01675d4501a73683cd065062bd3662a7ff Mon Sep 17 00:00:00 2001 From: Allard Hoeve Date: Thu, 4 May 2017 16:41:34 +0200 Subject: [PATCH] RequestValidation objects always have attributes --- xolphin/responses/request_validation.py | 12 ++++-------- xolphin/responses/request_validation_domain.py | 16 ++++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/xolphin/responses/request_validation.py b/xolphin/responses/request_validation.py index fbb8ae5..0fb3561 100644 --- a/xolphin/responses/request_validation.py +++ b/xolphin/responses/request_validation.py @@ -3,11 +3,7 @@ class RequestValidation(object): def __init__(self, data): - if 'status' in data: self.status = data['status'] - if 'statusDetail' in data: self.status_detail = data['statusDetail'] - if 'statusMessage' in data: self.status_message = data['statusMessage'] - - if 'domains' in data: - self.domains = [] - for domain in data['domains']: - self.domains.append(RequestValidationDomain(domain)) \ No newline at end of file + self.status = data.get('status') + self.status_detail = data.get('statusDetail') + self.status_message = data.get('statusMessage') + self.domains = [RequestValidationDomain(domain) for domain in data.get('domains', [])] diff --git a/xolphin/responses/request_validation_domain.py b/xolphin/responses/request_validation_domain.py index 91ccb77..7fb72db 100644 --- a/xolphin/responses/request_validation_domain.py +++ b/xolphin/responses/request_validation_domain.py @@ -1,10 +1,10 @@ class RequestValidationDomain(object): def __init__(self, data): - if 'domain' in data: self.domain = data['domain'] - if 'dcvType' in data: self.dcv_type = data['dcvType'] - if 'dcvEmail' in data: self.dcv_email = data['dcvEmail'] - if 'status' in data: self.status = data['status'] - if 'statusDetail' in data: self.status_detail = data['statusDetail'] - if 'statusMessage' in data: self.status_message = data['statusMessage'] - if 'md5' in data: self.md5 = data['md5'] - if 'sha1' in data: self.sha1 = data['sha1'] + self.domain = data.get('domain') + self.dcv_type = data.get('dcvType') + self.dcv_email = data.get('dcvEmail') + self.status = data.get('status') + self.status_detail = data.get('statusDetail') + self.status_message = data.get('statusMessage') + self.md5 = data.get('md5') + self.sha1 = data.get('sha1')