diff --git a/pythonwhois/parse.py b/pythonwhois/parse.py index fd84d1f..34dc5dc 100644 --- a/pythonwhois/parse.py +++ b/pythonwhois/parse.py @@ -480,7 +480,7 @@ def parse_registrants(data): "Eligibility Type:[ ]*Citizen\/Resident\n[\s\S]*Registrant Contact ID:[ ]*(?P.+)\n[\s\S]*Registrant Contact Name:[ ]*(?P.+)\n", # .au individual "Registrant:[ ]*(?P.+)\n[\s\S]*Eligibility Type:[ ]*(Higher Education Institution|Company|Incorporated Association|Other)\n[\s\S]*Registrant Contact ID:[ ]*(?P.+)\n[\s\S]*Registrant Contact Name:[ ]*(?P.+)\n", # .au educational, company, 'incorporated association' (non-profit?), other (spotted for linux.conf.au, unsure if also for others) " Registrant:\n (?P.+)\n\n Registrant type:\n .*\n\n Registrant's address:\n The registrant .* opted to have", # Nominet (.uk) with hidden address - " Registrant:\n (?P.+)\n\n Registrant type:\n .*\n\n Registrant's address:\n (?P.+)\n(?: (?P.+)\n)?(?: (?P.+)\n)? (?P.+)\n (?P.+)\n (?P.+)\n (?P.+)", # Nominet (.uk) with visible address + " Registrant:\n (?P.+)\n\n[\s\S]* Registrant type:\n .*\n\n Registrant's address:\n (?P.+)\n(?: (?P.+)\n)?(?: (?P.+)\n)? (?P.+)\n (?P.+)\n (?P.+)\n (?P.+)\n\n", # Nominet (.uk) with visible address "Registrant contact:\n (?P.+)\n (?P.*)\n (?P.+), (?P.+) (?P.+) (?P.+)\n\n", # Fabulous.com "registrant-name:\s*(?P.+)\nregistrant-type:\s*(?P.+)\nregistrant-address:\s*(?P.+)\nregistrant-postcode:\s*(?P.+)\nregistrant-city:\s*(?P.+)\nregistrant-country:\s*(?P.+)\n(?:registrant-phone:\s*(?P.+)\n)?(?:registrant-email:\s*(?P.+)\n)?", # Hetzner "Registrant Contact Information :[ ]*\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n\n", # GAL Communication diff --git a/test/data/baligems.co.uk b/test/data/baligems.co.uk new file mode 100644 index 0000000..73b5ab3 --- /dev/null +++ b/test/data/baligems.co.uk @@ -0,0 +1,54 @@ + + Domain name: + baligems.co.uk + + Registrant: + Global Travel Group + + Trading as: + The Global Travel Group Plc + + Registrant type: + UK Public Limited Company, (Company number: 2774722) + + Registrant's address: + 2nd Floor Dale House + Tiviot Dale + Stockport + Cheshire + SK1 1TB + United Kingdom + + Registrar: + Mesh Digital Limited t/a Domainmonster.com [Tag = MONSTER] + URL: http://www.domainmonster.com + + Relevant dates: + Registered on: 04-Feb-2008 + Expiry date: 04-Feb-2015 + Last updated: 20-Jan-2014 + + Registration status: + Registered until expiry date. + + Name servers: + ns1.domainmonster.com + ns2.domainmonster.com + ns3.domainmonster.com + + WHOIS lookup made at 09:27:26 15-Apr-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. + diff --git a/test/target_default/baligems.co.uk b/test/target_default/baligems.co.uk new file mode 100644 index 0000000..87d632f --- /dev/null +++ b/test/target_default/baligems.co.uk @@ -0,0 +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]"]} \ No newline at end of file diff --git a/test/target_normalized/baligems.co.uk b/test/target_normalized/baligems.co.uk new file mode 100644 index 0000000..87d632f --- /dev/null +++ b/test/target_normalized/baligems.co.uk @@ -0,0 +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]"]} \ No newline at end of file