Fix post-processing of empty but existent registrant entries, like for the.ai

Author: joepie91

pythonwhois/parse.py

@@ -856,6 +856,10 @@ def normalize_data(data, normalized):
 
 					if contact[key] == "-" or contact[key].lower() == "n/a" or contact[key].lower() == "null":
 						del contact[key]
+		
+		if contact is not None and len(contact) == 0:
+			# We don't have any actual data.
+			data['contacts'][contact_type] = None
 	return data
 
 def deduplicate(value, fuzzy=False):

test/data/the.ai

@@ -0,0 +1,60 @@
+DOMAIN INFORMATION
+
+ Complete Domain Name........: the.ai
+Organization Using Domain Name
+ Organization Name..........: 
+ Street Address.............: 
+ City.......................: 
+ State......................: 
+ Postal Code................: 
+ Country....................: 
+Administrative Contact
+ NIC Handle (if known)......: 
+ (I)ndividual (R)ole........: 
+ Name (Last, First).........: 
+ Organization Name..........: 
+ Street Address.............: 
+ City.......................: 
+ State......................: 
+ Postal Code................: 
+ Country....................: 
+ Phone Number...............: 
+ Fax Number.................: 
+ E-Mailbox..................: [email protected]
+Technical Contact
+ NIC Handle (if known)......: 
+ (I)ndividual (R)ole........: 
+ Name (Last, First).........: 
+ Organization Name..........: 
+ Street Address.............: 
+ City.......................: 
+ State......................: 
+ Postal Code................: 
+ Country....................: 
+ Phone Number...............: 
+ Fax Number.................: 
+ E-Mailbox..................: 
+Billing Contact
+ NIC Handle (if known)......: 
+ (I)ndividual (R)ole........: 
+ Name (Last, First).........: 
+ Organization Name..........: 
+ Street Address.............: 
+ City.......................: 
+ State......................: 
+ Postal Code................: 
+ Country....................: 
+ Phone Number...............: 
+ Fax Number.................: 
+ E-Mailbox..................: 
+Nameservers
+ Primary Server Hostname....: ns51.1and1.com
+ Primary Server Netaddress..: 
+ Secondary Server Hostname..: ns52.1and1.com
+ Secondary Server Netaddress: 
+ Third Server Hostname......: 
+ Fourth Server Hostname.....: 
+
+
+Last paid by: [email protected]
+

test/target_default/the.ai

@@ -0,0 +1 @@
+{"nameservers": ["ns51.1and1.com", "ns52.1and1.com"], "raw": ["DOMAIN INFORMATION\n\n Complete Domain Name........: the.ai\nOrganization Using Domain Name\n Organization Name..........: \n Street Address.............: \n City.......................: \n State......................: \n Postal Code................: \n Country....................: \nAdministrative Contact\n NIC Handle (if known)......: \n (I)ndividual (R)ole........: \n Name (Last, First).........: \n Organization Name..........: \n Street Address.............: \n City.......................: \n State......................: \n Postal Code................: \n Country....................: \n Phone Number...............: \n Fax Number.................: \n E-Mailbox..................: [email protected]\nTechnical Contact\n NIC Handle (if known)......: \n (I)ndividual (R)ole........: \n Name (Last, First).........: \n Organization Name..........: \n Street Address.............: \n City.......................: \n State......................: \n Postal Code................: \n Country....................: \n Phone Number...............: \n Fax Number.................: \n E-Mailbox..................: \nBilling Contact\n NIC Handle (if known)......: \n (I)ndividual (R)ole........: \n Name (Last, First).........: \n Organization Name..........: \n Street Address.............: \n City.......................: \n State......................: \n Postal Code................: \n Country....................: \n Phone Number...............: \n Fax Number.................: \n E-Mailbox..................: \nNameservers\n Primary Server Hostname....: ns51.1and1.com\n Primary Server Netaddress..: \n Secondary Server Hostname..: ns52.1and1.com\n Secondary Server Netaddress: \n Third Server Hostname......: \n Fourth Server Hostname.....: \n\n\nLast paid by: [email protected]\n\n"], "contacts": {"admin": {"email": "[email protected]"}, "tech": {}, "registrant": {}, "billing": {}}}

test/target_normalized/the.ai

@@ -0,0 +1 @@
+{"nameservers": ["ns51.1and1.com", "ns52.1and1.com"], "raw": ["DOMAIN INFORMATION\n\n Complete Domain Name........: the.ai\nOrganization Using Domain Name\n Organization Name..........: \n Street Address.............: \n City.......................: \n State......................: \n Postal Code................: \n Country....................: \nAdministrative Contact\n NIC Handle (if known)......: \n (I)ndividual (R)ole........: \n Name (Last, First).........: \n Organization Name..........: \n Street Address.............: \n City.......................: \n State......................: \n Postal Code................: \n Country....................: \n Phone Number...............: \n Fax Number.................: \n E-Mailbox..................: [email protected]\nTechnical Contact\n NIC Handle (if known)......: \n (I)ndividual (R)ole........: \n Name (Last, First).........: \n Organization Name..........: \n Street Address.............: \n City.......................: \n State......................: \n Postal Code................: \n Country....................: \n Phone Number...............: \n Fax Number.................: \n E-Mailbox..................: \nBilling Contact\n NIC Handle (if known)......: \n (I)ndividual (R)ole........: \n Name (Last, First).........: \n Organization Name..........: \n Street Address.............: \n City.......................: \n State......................: \n Postal Code................: \n Country....................: \n Phone Number...............: \n Fax Number.................: \n E-Mailbox..................: \nNameservers\n Primary Server Hostname....: ns51.1and1.com\n Primary Server Netaddress..: \n Secondary Server Hostname..: ns52.1and1.com\n Secondary Server Netaddress: \n Third Server Hostname......: \n Fourth Server Hostname.....: \n\n\nLast paid by: [email protected]\n\n"], "contacts": {"admin": {"email": "[email protected]"}, "tech": null, "registrant": null, "billing": null}}