Skip to content

Commit eefb2c2

Browse files
committed
RequestValidation objects always have attributes
When working with validation requests, there are always domains, thus there are always zero or more validation request domains. This makes it easier to work with the objects. Based on xolphin#3
1 parent c5087bb commit eefb2c2

File tree

2 files changed

+17
-21
lines changed

2 files changed

+17
-21
lines changed

xolphin/responses/request_validation.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22

33
class RequestValidation(object):
44
def __init__(self, data):
5-
if 'status' in data: self.status = data['status']
6-
if 'statusDetail' in data: self.status_detail = data['statusDetail']
7-
if 'statusMessage' in data: self.status_message = data['statusMessage']
8-
if 'message' in data: self.message = data['message']
9-
10-
if 'domains' in data:
11-
self.domains = []
12-
for domain in data['domains']:
13-
self.domains.append(RequestValidationDomain(domain))
5+
self.status = data.get('status')
6+
self.status_detail = data.get('statusDetail')
7+
self.status_message = data.get('statusMessage')
8+
self.message = data.get('message')
9+
self.domains = [RequestValidationDomain(domain) for domain in data.get('domains', [])]
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
class RequestValidationDomain(object):
22
def __init__(self, data):
3-
if 'domain' in data: self.domain = data['domain']
4-
if 'dcvType' in data: self.dcv_type = data['dcvType']
5-
if 'dcvEmail' in data: self.dcv_email = data['dcvEmail']
6-
if 'status' in data: self.status = data['status']
7-
if 'statusDetail' in data: self.status_detail = data['statusDetail']
8-
if 'statusMessage' in data: self.status_message = data['statusMessage']
9-
if 'md5' in data: self.md5 = data['md5']
10-
if 'sha1' in data: self.sha1 = data['sha1']
3+
self.domain = data.get('domain')
4+
self.dcv_type = data.get('dcvType')
5+
self.dcv_email = data.get('dcvEmail')
6+
self.status = data.get('status')
7+
self.status_detail = data.get('statusDetail')
8+
self.status_message = data.get('statusMessage')
9+
self.md5 = data.get('md5')
10+
self.sha1 = data.get('sha1')
1111

12-
if 'dnsRecord' in data: self.dnsRecord = data['dnsRecord']
13-
if 'dnsCnameValue' in data: self.dnsCnameValue = data['dnsCnameValue']
14-
if 'fileLocation' in data: self.fileLocation = data['fileLocation']
15-
if 'fileContents' in data: self.fileContents = data['fileContents']
12+
self.dnsRecord = data.get('dnsRecord')
13+
self.dnsCnameValue = data.get('dnsCnameValue')
14+
self.fileLocation = data.get('fileLocation')
15+
self.fileContents = data.get('fileContents')

0 commit comments

Comments
 (0)