Add support for organization names in Nominet WHOIS data, and allow for extra fields in Nominet WHOIS data where the registrant has opted to have their address omitted. Fixes joepie91#36.

Author: joepie91

pythonwhois/parse.py

@@ -229,8 +229,8 @@ def preprocess_regex(regex):
 	"Registrant:[ ]*(?P<name>.+)\n[\s\S]*Eligibility Name:[ ]*(?P<organization>.+)\n[\s\S]*Registrant Contact ID:[ ]*(?P<handle>.+)\n", # .au business
 	"Eligibility Type:[ ]*Citizen\/Resident\n[\s\S]*Registrant Contact ID:[ ]*(?P<handle>.+)\n[\s\S]*Registrant Contact Name:[ ]*(?P<name>.+)\n", # .au individual
 	"Registrant:[ ]*(?P<organization>.+)\n[\s\S]*Eligibility Type:[ ]*(Higher Education Institution|Company|Incorporated Association|Other)\n[\s\S]*Registrant Contact ID:[ ]*(?P<handle>.+)\n[\s\S]*Registrant Contact Name:[ ]*(?P<name>.+)\n", # .au educational, company, 'incorporated association' (non-profit?), other (spotted for linux.conf.au, unsure if also for others)
-	"    Registrant:\n        (?P<name>.+)\n\n    Registrant type:\n        .*\n\n    Registrant's address:\n        The registrant .* opted to have", # Nominet (.uk) with hidden address
-	"    Registrant:\n        (?P<name>.+)\n\n[\s\S]*    Registrant type:\n        .*\n\n    Registrant's address:\n        (?P<street1>.+)\n(?:        (?P<street2>.+)\n(?:        (?P<street3>.+)\n)??)??        (?P<city>[^0-9\n]+)\n(?:        (?P<state>.+)\n)?        (?P<postalcode>.+)\n        (?P<country>.+)\n\n", # Nominet (.uk) with visible address
+	"    Registrant:\n        (?P<name>.+)\n\n(?:    Trading as:\s?\n        (?P<organization>.+)\n\n)?[\s\S]*    Registrant type:\n        .*\n\n    Registrant's address:\n        The registrant .* opted to have", # Nominet (.uk) with hidden address
+	"    Registrant:\n        (?P<name>.+)\n\n(?:    Trading as:\s?\n        (?P<organization>.+)\n\n)?[\s\S]*    Registrant type:\n        .*\n\n    Registrant's address:\n        (?P<street1>.+)\n(?:        (?P<street2>.+)\n(?:        (?P<street3>.+)\n)??)??        (?P<city>[^0-9\n]+)\n(?:        (?P<state>.+)\n)?        (?P<postalcode>.+)\n        (?P<country>.+)\n\n", # Nominet (.uk) with visible address
 	"Domain Owner:\n\t(?P<organization>.+)\n\n[\s\S]*?(?:Registrant Contact:\n\t(?P<name>.+))?\n\nRegistrant(?:'s)? (?:a|A)ddress:(?:\n\t(?P<street1>.+)\n(?:\t(?P<street2>.+)\n)?(?:\t(?P<street3>.+)\n)?\t(?P<city>.+)\n\t(?P<postalcode>.+))?\n\t(?P<country>.+)(?:\n\t(?P<phone>.+) \(Phone\)\n\t(?P<fax>.+) \(FAX\)\n\t(?P<email>.+))?\n\n", # .ac.uk - what a mess...
 	"Registrant ID: (?P<handle>.+)\nRegistrant: (?P<name>.+)\nRegistrant Contact Email: (?P<email>.+)", # .cn (CNNIC)
 	"Registrant contact:\n  (?P<name>.+)\n  (?P<street>.*)\n  (?P<city>.+), (?P<state>.+) (?P<postalcode>.+) (?P<country>.+)\n\n", # Fabulous.com

test/data/tattitude.co.uk

@@ -0,0 +1,53 @@
+
+    Domain name:
+        tattitude.co.uk
+
+    Registrant:
+        Paul Hartley
+
+    Trading as: 
+        Private Registration US
+
+    Registrant type:
+        UK Individual
+
+    Registrant's address:
+        The registrant is a non-trading individual who has opted to have their
+        address omitted from the WHOIS service.
+
+    Data validation:
+        Registrant contact details validated by Nominet on 10-Dec-2012
+
+    Registrar:
+        Melbourne IT t/a Internet Names Worldwide [Tag = MELBOURNE-IT]
+        URL: http://www.melbourneit.com.au/contacts
+
+    Relevant dates:
+        Registered on: 14-Jul-2007
+        Expiry date:  14-Jul-2017
+        Last updated:  14-Jun-2013
+
+    Registration status:
+        Registered until expiry date.
+
+    Name servers:
+        ns1.pipedns.com
+        ns2.pipedns.com
+        ns3.pipedns.com
+
+    WHOIS lookup made at 01:14:59 06-Oct-2014
+
+-- 
+This WHOIS information is provided for free by Nominet UK the central registry
+for .uk domain names. This information and the .uk WHOIS are:
+
+    Copyright Nominet UK 1996 - 2014.
+
+You may not access the .uk WHOIS or use any data from it except as permitted
+by the terms of use available in full at http://www.nominet.org.uk/whoisterms,
+which includes restrictions on: (A) use of the data for advertising, or its
+repackaging, recompilation, redistribution or reuse (B) obscuring, removing
+or hiding any or all of this notice and (C) exceeding query rate or volume
+limits. The data is provided on an 'as-is' basis and may lag behind the
+register. Access may be withdrawn or restricted at any time. 
+

test/target_default/baligems.co.uk

@@ -1 +1 @@
-{"updated_date": ["2014-01-20T00:00:00"], "status": ["Registered until expiry date."], "contacts": {"admin": null, "tech": null, "registrant": {"city": "Stockport", "name": "Global Travel Group", "state": "Cheshire", "street": "2nd Floor Dale House\nTiviot Dale", "country": "United Kingdom", "postalcode": "SK1 1TB"}, "billing": null}, "nameservers": ["ns1.domainmonster.com", "ns2.domainmonster.com", "ns3.domainmonster.com"], "expiration_date": ["2015-02-04T00:00:00"], "creation_date": ["2008-02-04T00:00:00", "2008-02-04T00:00:00", "2008-02-04T00:00:00"], "raw": ["\n    Domain name:\n        baligems.co.uk\n\n    Registrant:\n        Global Travel Group\n\n    Trading as: \n        The Global Travel Group Plc\n\n    Registrant type:\n        UK Public Limited Company, (Company number: 2774722)\n\n    Registrant's address:\n        2nd Floor Dale House\n        Tiviot Dale\n        Stockport\n        Cheshire\n        SK1 1TB\n        United Kingdom\n\n    Registrar:\n        Mesh Digital Limited t/a Domainmonster.com [Tag = MONSTER]\n        URL: http://www.domainmonster.com\n\n    Relevant dates:\n        Registered on: 04-Feb-2008\n        Expiry date:  04-Feb-2015\n        Last updated:  20-Jan-2014\n\n    Registration status:\n        Registered until expiry date.\n\n    Name servers:\n        ns1.domainmonster.com\n        ns2.domainmonster.com\n        ns3.domainmonster.com\n\n    WHOIS lookup made at 09:27:26 15-Apr-2014\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n    Copyright Nominet UK 1996 - 2014.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms,\nwhich includes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "registrar": ["Mesh Digital Limited t/a Domainmonster.com [Tag = MONSTER]"]}
+{"updated_date": ["2014-01-20T00:00:00"], "status": ["Registered until expiry date."], "contacts": {"admin": null, "tech": null, "registrant": {"city": "Stockport", "name": "Global Travel Group", "state": "Cheshire", "street": "2nd Floor Dale House\nTiviot Dale", "country": "United Kingdom", "postalcode": "SK1 1TB", "organization": "The Global Travel Group Plc"}, "billing": null}, "nameservers": ["ns1.domainmonster.com", "ns2.domainmonster.com", "ns3.domainmonster.com"], "expiration_date": ["2015-02-04T00:00:00"], "creation_date": ["2008-02-04T00:00:00", "2008-02-04T00:00:00", "2008-02-04T00:00:00"], "raw": ["\n    Domain name:\n        baligems.co.uk\n\n    Registrant:\n        Global Travel Group\n\n    Trading as: \n        The Global Travel Group Plc\n\n    Registrant type:\n        UK Public Limited Company, (Company number: 2774722)\n\n    Registrant's address:\n        2nd Floor Dale House\n        Tiviot Dale\n        Stockport\n        Cheshire\n        SK1 1TB\n        United Kingdom\n\n    Registrar:\n        Mesh Digital Limited t/a Domainmonster.com [Tag = MONSTER]\n        URL: http://www.domainmonster.com\n\n    Relevant dates:\n        Registered on: 04-Feb-2008\n        Expiry date:  04-Feb-2015\n        Last updated:  20-Jan-2014\n\n    Registration status:\n        Registered until expiry date.\n\n    Name servers:\n        ns1.domainmonster.com\n        ns2.domainmonster.com\n        ns3.domainmonster.com\n\n    WHOIS lookup made at 09:27:26 15-Apr-2014\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n    Copyright Nominet UK 1996 - 2014.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms,\nwhich includes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "registrar": ["Mesh Digital Limited t/a Domainmonster.com [Tag = MONSTER]"]}

test/target_default/tattitude.co.uk

@@ -0,0 +1 @@
+{"updated_date": ["2013-06-14T00:00:00"], "status": ["Registered until expiry date."], "contacts": {"admin": null, "tech": null, "registrant": {"organization": "Private Registration US", "name": "Paul Hartley"}, "billing": null}, "nameservers": ["ns1.pipedns.com", "ns2.pipedns.com", "ns3.pipedns.com"], "expiration_date": ["2017-07-14T00:00:00"], "creation_date": ["2007-07-14T00:00:00", "2007-07-14T00:00:00", "2007-07-14T00:00:00"], "raw": ["\n    Domain name:\n        tattitude.co.uk\n\n    Registrant:\n        Paul Hartley\n\n    Trading as: \n        Private Registration US\n\n    Registrant type:\n        UK Individual\n\n    Registrant's address:\n        The registrant is a non-trading individual who has opted to have their\n        address omitted from the WHOIS service.\n\n    Data validation:\n        Registrant contact details validated by Nominet on 10-Dec-2012\n\n    Registrar:\n        Melbourne IT t/a Internet Names Worldwide [Tag = MELBOURNE-IT]\n        URL: http://www.melbourneit.com.au/contacts\n\n    Relevant dates:\n        Registered on: 14-Jul-2007\n        Expiry date:  14-Jul-2017\n        Last updated:  14-Jun-2013\n\n    Registration status:\n        Registered until expiry date.\n\n    Name servers:\n        ns1.pipedns.com\n        ns2.pipedns.com\n        ns3.pipedns.com\n\n    WHOIS lookup made at 01:14:59 06-Oct-2014\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n    Copyright Nominet UK 1996 - 2014.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms,\nwhich includes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "registrar": ["Melbourne IT t/a Internet Names Worldwide [Tag = MELBOURNE-IT]"]}

test/target_normalized/baligems.co.uk

@@ -1 +1 @@
-{"updated_date": ["2014-01-20T00:00:00"], "status": ["Registered until expiry date."], "contacts": {"admin": null, "tech": null, "registrant": {"city": "Stockport", "name": "Global Travel Group", "state": "Cheshire", "street": "2nd Floor Dale House\nTiviot Dale", "country": "United Kingdom", "postalcode": "SK1 1TB"}, "billing": null}, "nameservers": ["ns1.domainmonster.com", "ns2.domainmonster.com", "ns3.domainmonster.com"], "expiration_date": ["2015-02-04T00:00:00"], "creation_date": ["2008-02-04T00:00:00", "2008-02-04T00:00:00", "2008-02-04T00:00:00"], "raw": ["\n    Domain name:\n        baligems.co.uk\n\n    Registrant:\n        Global Travel Group\n\n    Trading as: \n        The Global Travel Group Plc\n\n    Registrant type:\n        UK Public Limited Company, (Company number: 2774722)\n\n    Registrant's address:\n        2nd Floor Dale House\n        Tiviot Dale\n        Stockport\n        Cheshire\n        SK1 1TB\n        United Kingdom\n\n    Registrar:\n        Mesh Digital Limited t/a Domainmonster.com [Tag = MONSTER]\n        URL: http://www.domainmonster.com\n\n    Relevant dates:\n        Registered on: 04-Feb-2008\n        Expiry date:  04-Feb-2015\n        Last updated:  20-Jan-2014\n\n    Registration status:\n        Registered until expiry date.\n\n    Name servers:\n        ns1.domainmonster.com\n        ns2.domainmonster.com\n        ns3.domainmonster.com\n\n    WHOIS lookup made at 09:27:26 15-Apr-2014\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n    Copyright Nominet UK 1996 - 2014.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms,\nwhich includes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "registrar": ["Mesh Digital Limited t/a Domainmonster.com [Tag = MONSTER]"]}
+{"updated_date": ["2014-01-20T00:00:00"], "status": ["Registered until expiry date."], "contacts": {"admin": null, "tech": null, "registrant": {"city": "Stockport", "name": "Global Travel Group", "state": "Cheshire", "street": "2nd Floor Dale House\nTiviot Dale", "country": "United Kingdom", "postalcode": "SK1 1TB", "organization": "The Global Travel Group Plc"}, "billing": null}, "nameservers": ["ns1.domainmonster.com", "ns2.domainmonster.com", "ns3.domainmonster.com"], "expiration_date": ["2015-02-04T00:00:00"], "creation_date": ["2008-02-04T00:00:00", "2008-02-04T00:00:00", "2008-02-04T00:00:00"], "raw": ["\n    Domain name:\n        baligems.co.uk\n\n    Registrant:\n        Global Travel Group\n\n    Trading as: \n        The Global Travel Group Plc\n\n    Registrant type:\n        UK Public Limited Company, (Company number: 2774722)\n\n    Registrant's address:\n        2nd Floor Dale House\n        Tiviot Dale\n        Stockport\n        Cheshire\n        SK1 1TB\n        United Kingdom\n\n    Registrar:\n        Mesh Digital Limited t/a Domainmonster.com [Tag = MONSTER]\n        URL: http://www.domainmonster.com\n\n    Relevant dates:\n        Registered on: 04-Feb-2008\n        Expiry date:  04-Feb-2015\n        Last updated:  20-Jan-2014\n\n    Registration status:\n        Registered until expiry date.\n\n    Name servers:\n        ns1.domainmonster.com\n        ns2.domainmonster.com\n        ns3.domainmonster.com\n\n    WHOIS lookup made at 09:27:26 15-Apr-2014\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n    Copyright Nominet UK 1996 - 2014.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms,\nwhich includes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "registrar": ["Mesh Digital Limited t/a Domainmonster.com [Tag = MONSTER]"]}

test/target_normalized/tattitude.co.uk

@@ -0,0 +1 @@
+{"updated_date": ["2013-06-14T00:00:00"], "status": ["Registered until expiry date."], "contacts": {"admin": null, "tech": null, "registrant": {"organization": "Private Registration US", "name": "Paul Hartley"}, "billing": null}, "nameservers": ["ns1.pipedns.com", "ns2.pipedns.com", "ns3.pipedns.com"], "expiration_date": ["2017-07-14T00:00:00"], "creation_date": ["2007-07-14T00:00:00", "2007-07-14T00:00:00", "2007-07-14T00:00:00"], "raw": ["\n    Domain name:\n        tattitude.co.uk\n\n    Registrant:\n        Paul Hartley\n\n    Trading as: \n        Private Registration US\n\n    Registrant type:\n        UK Individual\n\n    Registrant's address:\n        The registrant is a non-trading individual who has opted to have their\n        address omitted from the WHOIS service.\n\n    Data validation:\n        Registrant contact details validated by Nominet on 10-Dec-2012\n\n    Registrar:\n        Melbourne IT t/a Internet Names Worldwide [Tag = MELBOURNE-IT]\n        URL: http://www.melbourneit.com.au/contacts\n\n    Relevant dates:\n        Registered on: 14-Jul-2007\n        Expiry date:  14-Jul-2017\n        Last updated:  14-Jun-2013\n\n    Registration status:\n        Registered until expiry date.\n\n    Name servers:\n        ns1.pipedns.com\n        ns2.pipedns.com\n        ns3.pipedns.com\n\n    WHOIS lookup made at 01:14:59 06-Oct-2014\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n    Copyright Nominet UK 1996 - 2014.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms,\nwhich includes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "registrar": ["Melbourne IT t/a Internet Names Worldwide [Tag = MELBOURNE-IT]"]}