From 81b5b8136b94efd035054872a78387eef4632b8a Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Sat, 23 Nov 2013 17:34:57 +0100 Subject: [PATCH] Improve normalization by making it leave alone (likely) abbreviations --- pythonwhois/parse.py | 7 ++++--- test/target_normalized/atheme.org | 2 +- test/target_normalized/f63.net | 2 +- test/target_normalized/nic.pw | 2 +- test/target_normalized/ovh.fr | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pythonwhois/parse.py b/pythonwhois/parse.py index 30d8c91..f475d27 100644 --- a/pythonwhois/parse.py +++ b/pythonwhois/parse.py @@ -228,11 +228,12 @@ def normalize_data(data, normalized): for key in ("registrar", "status"): if key in data and data[key] is not None and (normalized == True or key in normalized): if isinstance(data[key], basestring) and data[key].isupper(): - # This won't do newlines correctly... Fix that! (known issue with eg. donuts.co, swisscom.ch) - data[key] = " ".join(word.capitalize() for word in data[key].split(" ")) + if len(data[key] > 3): # Don't change abbreviations.. + # This won't do newlines correctly... Fix that! (known issue with eg. donuts.co, swisscom.ch) + data[key] = " ".join(word.capitalize() for word in data[key].split(" ")) else: # This might mess up the order? Also seems like there may be another bug here... - data[key] = [" ".join(word.capitalize() for word in item.split(" ")) for item in data[key] if item.isupper()] + [item for item in data[key] if not item.isupper()] + data[key] = [" ".join(word.capitalize() for word in item.split(" ")) for item in data[key] if item.isupper() and len(item) > 3] + [item for item in data[key] if not item.isupper() or len(item) <= 3] for contact_type, contact in data['contacts'].iteritems(): if contact is not None: diff --git a/test/target_normalized/atheme.org b/test/target_normalized/atheme.org index 3fdbcdb..082c21b 100644 --- a/test/target_normalized/atheme.org +++ b/test/target_normalized/atheme.org @@ -1 +1 @@ -{"status": ["Ok"], "updated_date": ["2013-06-20T04:41:04"], "contacts": {"admin": {"city": "Tulsa", "handle": "WP684-GANDI", "name": "William Pitcock", "state": "OK", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "email": "f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net"}, "tech": {"city": "Tulsa", "handle": "WP684-GANDI", "name": "William Pitcock", "state": "OK", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "email": "f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net"}, "registrant": {"city": "Tulsa", "handle": "0-1280133-GANDI", "name": "William Pitcock", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "organization": "atheme.org", "email": "e370de2cae0d52f8b0c6da942578cef1-815986@contact.gandi.net"}, "billing": null}, "expiration_date": ["2014-06-19T22:15:59"], "emails": [], "raw": ["Access to .ORG WHOIS information is provided to assist persons in \ndetermining the contents of a domain name registration record in the \nPublic Interest Registry registry database. The data in this record is provided by \nPublic Interest Registry for informational purposes only, and Public Interest Registry does not \nguarantee its accuracy. This service is intended only for query-based \naccess. You agree that you will use this data only for lawful purposes \nand that, under no circumstances will you use this data to: (a) allow, \nenable, or otherwise support the transmission by e-mail, telephone, or \nfacsimile of mass unsolicited, commercial advertising or solicitations \nto entities other than the data recipient's own existing customers; or \n(b) enable high volume, automated, electronic processes that send \nqueries or data to the systems of Registry Operator, a Registrar, or \nAfilias except as reasonably necessary to register domain names or \nmodify existing registrations. All rights reserved. Public Interest Registry reserves \nthe right to modify these terms at any time. By submitting this query, \nyou agree to abide by this policy. \n\nDomain ID:D106661323-LROR\nDomain Name:ATHEME.ORG\nCreated On:19-Jun-2005 22:15:59 UTC\nLast Updated On:20-Jun-2013 04:41:04 UTC\nExpiration Date:19-Jun-2014 22:15:59 UTC\nSponsoring Registrar:Gandi SAS (R42-LROR)\nStatus:OK\nRegistrant ID:0-1280133-GANDI\nRegistrant Name:William Pitcock\nRegistrant Organization:atheme.org\nRegistrant Street1:217 E Zion St\nRegistrant Street2:\nRegistrant Street3:\nRegistrant City:Tulsa\nRegistrant State/Province:\nRegistrant Postal Code:74106\nRegistrant Country:US\nRegistrant Phone:+1.9188949052\nRegistrant Phone Ext.:\nRegistrant FAX:\nRegistrant FAX Ext.:\nRegistrant Email:e370de2cae0d52f8b0c6da942578cef1-815986@contact.gandi.net\nAdmin ID:WP684-GANDI\nAdmin Name:William Pitcock\nAdmin Street1:217 E Zion St\nAdmin Street2:\nAdmin Street3:\nAdmin City:Tulsa\nAdmin State/Province:OK\nAdmin Postal Code:74106\nAdmin Country:US\nAdmin Phone:+1.9188949052\nAdmin Phone Ext.:\nAdmin FAX:\nAdmin FAX Ext.:\nAdmin Email:f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net\nTech ID:WP684-GANDI\nTech Name:William Pitcock\nTech Street1:217 E Zion St\nTech Street2:\nTech Street3:\nTech City:Tulsa\nTech State/Province:OK\nTech Postal Code:74106\nTech Country:US\nTech Phone:+1.9188949052\nTech Phone Ext.:\nTech FAX:\nTech FAX Ext.:\nTech Email:f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net\nName Server:C.DNS.GANDI.NET\nName Server:B.DNS.GANDI.NET\nName Server:A.DNS.GANDI.NET\nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nDNSSEC:Unsigned\n\n\n"], "whois_server": null, "registrar": ["Gandi SAS (R42-LROR)"], "name_servers": ["c.dns.gandi.net", "b.dns.gandi.net", "a.dns.gandi.net"], "creation_date": ["2005-06-19T22:15:59", "2005-06-19T22:15:59"], "id": ["D106661323-LROR"]} \ No newline at end of file +{"status": ["OK"], "updated_date": ["2013-06-20T04:41:04"], "contacts": {"admin": {"city": "Tulsa", "handle": "WP684-GANDI", "name": "William Pitcock", "state": "OK", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "email": "f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net"}, "tech": {"city": "Tulsa", "handle": "WP684-GANDI", "name": "William Pitcock", "state": "OK", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "email": "f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net"}, "registrant": {"city": "Tulsa", "handle": "0-1280133-GANDI", "name": "William Pitcock", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "organization": "atheme.org", "email": "e370de2cae0d52f8b0c6da942578cef1-815986@contact.gandi.net"}, "billing": null}, "expiration_date": ["2014-06-19T22:15:59"], "emails": [], "raw": ["Access to .ORG WHOIS information is provided to assist persons in \ndetermining the contents of a domain name registration record in the \nPublic Interest Registry registry database. The data in this record is provided by \nPublic Interest Registry for informational purposes only, and Public Interest Registry does not \nguarantee its accuracy. This service is intended only for query-based \naccess. You agree that you will use this data only for lawful purposes \nand that, under no circumstances will you use this data to: (a) allow, \nenable, or otherwise support the transmission by e-mail, telephone, or \nfacsimile of mass unsolicited, commercial advertising or solicitations \nto entities other than the data recipient's own existing customers; or \n(b) enable high volume, automated, electronic processes that send \nqueries or data to the systems of Registry Operator, a Registrar, or \nAfilias except as reasonably necessary to register domain names or \nmodify existing registrations. All rights reserved. Public Interest Registry reserves \nthe right to modify these terms at any time. By submitting this query, \nyou agree to abide by this policy. \n\nDomain ID:D106661323-LROR\nDomain Name:ATHEME.ORG\nCreated On:19-Jun-2005 22:15:59 UTC\nLast Updated On:20-Jun-2013 04:41:04 UTC\nExpiration Date:19-Jun-2014 22:15:59 UTC\nSponsoring Registrar:Gandi SAS (R42-LROR)\nStatus:OK\nRegistrant ID:0-1280133-GANDI\nRegistrant Name:William Pitcock\nRegistrant Organization:atheme.org\nRegistrant Street1:217 E Zion St\nRegistrant Street2:\nRegistrant Street3:\nRegistrant City:Tulsa\nRegistrant State/Province:\nRegistrant Postal Code:74106\nRegistrant Country:US\nRegistrant Phone:+1.9188949052\nRegistrant Phone Ext.:\nRegistrant FAX:\nRegistrant FAX Ext.:\nRegistrant Email:e370de2cae0d52f8b0c6da942578cef1-815986@contact.gandi.net\nAdmin ID:WP684-GANDI\nAdmin Name:William Pitcock\nAdmin Street1:217 E Zion St\nAdmin Street2:\nAdmin Street3:\nAdmin City:Tulsa\nAdmin State/Province:OK\nAdmin Postal Code:74106\nAdmin Country:US\nAdmin Phone:+1.9188949052\nAdmin Phone Ext.:\nAdmin FAX:\nAdmin FAX Ext.:\nAdmin Email:f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net\nTech ID:WP684-GANDI\nTech Name:William Pitcock\nTech Street1:217 E Zion St\nTech Street2:\nTech Street3:\nTech City:Tulsa\nTech State/Province:OK\nTech Postal Code:74106\nTech Country:US\nTech Phone:+1.9188949052\nTech Phone Ext.:\nTech FAX:\nTech FAX Ext.:\nTech Email:f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net\nName Server:C.DNS.GANDI.NET\nName Server:B.DNS.GANDI.NET\nName Server:A.DNS.GANDI.NET\nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nDNSSEC:Unsigned\n\n\n"], "whois_server": null, "registrar": ["Gandi SAS (R42-LROR)"], "name_servers": ["c.dns.gandi.net", "b.dns.gandi.net", "a.dns.gandi.net"], "creation_date": ["2005-06-19T22:15:59", "2005-06-19T22:15:59"], "id": ["D106661323-LROR"]} \ No newline at end of file diff --git a/test/target_normalized/f63.net b/test/target_normalized/f63.net index 3964aa5..deae725 100644 --- a/test/target_normalized/f63.net +++ b/test/target_normalized/f63.net @@ -1 +1 @@ -{"status": ["Active", "Nb", "Nb", "Nb", "Nb"], "updated_date": ["2013-09-28T20:31:36"], "contacts": {"admin": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "tech": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "registrant": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "billing": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}}, "expiration_date": ["2014-01-14T19:23:35"], "emails": [], "raw": ["; This data is provided by Orange Lemon BV\n; for information purposes, and to assist persons obtaining information\n; about or related to domain name registration records.\n; Orange Lemon BV does not guarantee its accuracy.\n; By submitting a WHOIS query, you agree that you will use this data\n; only for lawful purposes and that, under no circumstances, you will\n; use this data to\n; 1) allow, enable, or otherwise support the transmission of mass\n; unsolicited, commercial advertising or solicitations via E-mail\n; (spam); or\n; 2) enable high volume, automated, electronic processes that apply\n; to this WHOIS server.\n; These terms may be changed without prior notice.\n; By submitting this query, you agree to abide by this policy.\n; Please register your domains at; http://www.orangelemon.nl/\n\nDomain: f63.net\nRegistry Domain ID: 1773437237_DOMAIN_NET-VRSN\nRegistrar WHOIS Server: whois.rrpproxy.net\nRegistrar URL: http://www.orangelemon.nl/\nCreated Date: 2013-01-14T19:23:35.0Z\nUpdated Date: 2013-09-28T20:31:36.0Z\nRegistrar Registration Expiration Date: 2014-01-14T19:23:35.0Z\nRegistrar: Key-Systems GmbH\nRegistrar IANA ID: 269\nRegistrar Abuse Contact Email: abuse[at]key-systems.net\nRegistrar Abuse Contact Phone: - (Please send an email)\nReseller: Orange Lemon BV\nDomain Status: ACTIVE\nRegistrant Contact: P-CAT559\nRegistrant Organization: Orange Lemon BV\nRegistrant Name: Chris Talma\nRegistrant Street: Cranendonck 2\nRegistrant City: Eindhoven\nRegistrant Postal Code: 5653LA\nRegistrant State: NB\nRegistrant Country: NL\nRegistrant Phone: +31.408200199\nRegistrant Phone Ext: \nRegistrant Fax: \nRegistrant Fax Ext: \nRegistrant Email: info@orangelemon.nl\nAdmin Contact: P-CAT559\nAdmin Organization: Orange Lemon BV\nAdmin Name: Chris Talma\nAdmin Street: Cranendonck 2\nAdmin City: Eindhoven\nAdmin State: NB\nAdmin Postal Code: 5653LA\nAdmin Country: NL\nAdmin Phone: +31.408200199\nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext: \nAdmin Email: info@orangelemon.nl\nTech Contact: P-CAT559\nTech Organization: Orange Lemon BV\nTech Name: Chris Talma\nTech Street: Cranendonck 2\nTech City: Eindhoven\nTech Postal Code: 5653LA\nTech State: NB\nTech Country: NL\nTech Phone: +31.408200199\nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: info@orangelemon.nl\nBilling Contact: P-CAT559\nBilling Organization: Orange Lemon BV\nBilling Name: Chris Talma\nBilling Street: Cranendonck 2\nBilling City: Eindhoven\nBilling Postal Code: 5653LA\nBilling State: NB\nBilling Country: NL\nBilling Phone: +31.408200199\nBilling Phone Ext: \nBilling Fax: \nBilling Fax Ext: \nBilling Email: info@orangelemon.nl\nName Server: lucy.ns.cloudflare.com \nName Server: sid.ns.cloudflare.com \nDNSSEC: unsigned\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-20T04:15:32.0Z <<<\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: F63.NET\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n Name Server: LUCY.NS.CLOUDFLARE.COM\n Name Server: SID.NS.CLOUDFLARE.COM\n Status: ok\n Updated Date: 28-sep-2013\n Creation Date: 14-jan-2013\n Expiration Date: 14-jan-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:14:59 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.rrpproxy.net"], "registrar": ["Key-Systems GmbH"], "name_servers": ["lucy.ns.cloudflare.com", "sid.ns.cloudflare.com"], "creation_date": ["2013-01-14T19:23:35", "2013-01-14T19:23:35"], "id": ["1773437237_DOMAIN_NET-VRSN"]} \ No newline at end of file +{"status": ["Active", "NB", "NB", "NB", "NB"], "updated_date": ["2013-09-28T20:31:36"], "contacts": {"admin": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "tech": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "registrant": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "billing": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}}, "expiration_date": ["2014-01-14T19:23:35"], "emails": [], "raw": ["; This data is provided by Orange Lemon BV\n; for information purposes, and to assist persons obtaining information\n; about or related to domain name registration records.\n; Orange Lemon BV does not guarantee its accuracy.\n; By submitting a WHOIS query, you agree that you will use this data\n; only for lawful purposes and that, under no circumstances, you will\n; use this data to\n; 1) allow, enable, or otherwise support the transmission of mass\n; unsolicited, commercial advertising or solicitations via E-mail\n; (spam); or\n; 2) enable high volume, automated, electronic processes that apply\n; to this WHOIS server.\n; These terms may be changed without prior notice.\n; By submitting this query, you agree to abide by this policy.\n; Please register your domains at; http://www.orangelemon.nl/\n\nDomain: f63.net\nRegistry Domain ID: 1773437237_DOMAIN_NET-VRSN\nRegistrar WHOIS Server: whois.rrpproxy.net\nRegistrar URL: http://www.orangelemon.nl/\nCreated Date: 2013-01-14T19:23:35.0Z\nUpdated Date: 2013-09-28T20:31:36.0Z\nRegistrar Registration Expiration Date: 2014-01-14T19:23:35.0Z\nRegistrar: Key-Systems GmbH\nRegistrar IANA ID: 269\nRegistrar Abuse Contact Email: abuse[at]key-systems.net\nRegistrar Abuse Contact Phone: - (Please send an email)\nReseller: Orange Lemon BV\nDomain Status: ACTIVE\nRegistrant Contact: P-CAT559\nRegistrant Organization: Orange Lemon BV\nRegistrant Name: Chris Talma\nRegistrant Street: Cranendonck 2\nRegistrant City: Eindhoven\nRegistrant Postal Code: 5653LA\nRegistrant State: NB\nRegistrant Country: NL\nRegistrant Phone: +31.408200199\nRegistrant Phone Ext: \nRegistrant Fax: \nRegistrant Fax Ext: \nRegistrant Email: info@orangelemon.nl\nAdmin Contact: P-CAT559\nAdmin Organization: Orange Lemon BV\nAdmin Name: Chris Talma\nAdmin Street: Cranendonck 2\nAdmin City: Eindhoven\nAdmin State: NB\nAdmin Postal Code: 5653LA\nAdmin Country: NL\nAdmin Phone: +31.408200199\nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext: \nAdmin Email: info@orangelemon.nl\nTech Contact: P-CAT559\nTech Organization: Orange Lemon BV\nTech Name: Chris Talma\nTech Street: Cranendonck 2\nTech City: Eindhoven\nTech Postal Code: 5653LA\nTech State: NB\nTech Country: NL\nTech Phone: +31.408200199\nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: info@orangelemon.nl\nBilling Contact: P-CAT559\nBilling Organization: Orange Lemon BV\nBilling Name: Chris Talma\nBilling Street: Cranendonck 2\nBilling City: Eindhoven\nBilling Postal Code: 5653LA\nBilling State: NB\nBilling Country: NL\nBilling Phone: +31.408200199\nBilling Phone Ext: \nBilling Fax: \nBilling Fax Ext: \nBilling Email: info@orangelemon.nl\nName Server: lucy.ns.cloudflare.com \nName Server: sid.ns.cloudflare.com \nDNSSEC: unsigned\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-20T04:15:32.0Z <<<\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: F63.NET\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n Name Server: LUCY.NS.CLOUDFLARE.COM\n Name Server: SID.NS.CLOUDFLARE.COM\n Status: ok\n Updated Date: 28-sep-2013\n Creation Date: 14-jan-2013\n Expiration Date: 14-jan-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:14:59 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.rrpproxy.net"], "registrar": ["Key-Systems GmbH"], "name_servers": ["lucy.ns.cloudflare.com", "sid.ns.cloudflare.com"], "creation_date": ["2013-01-14T19:23:35", "2013-01-14T19:23:35"], "id": ["1773437237_DOMAIN_NET-VRSN"]} \ No newline at end of file diff --git a/test/target_normalized/nic.pw b/test/target_normalized/nic.pw index 88350ed..810cd64 100644 --- a/test/target_normalized/nic.pw +++ b/test/target_normalized/nic.pw @@ -1 +1 @@ -{"status": ["Ok"], "updated_date": ["2013-04-30T15:06:57"], "contacts": {"admin": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/a", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "tech": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/a", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "registrant": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/a", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "billing": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/a", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}}, "expiration_date": ["2020-01-01T23:59:59"], "emails": [], "raw": ["This whois service is provided by CentralNic Ltd and only contains\ninformation pertaining to Internet domain names we have registered for\nour customers. By using this service you are agreeing (1) not to use any\ninformation presented here for any purpose other than determining\nownership of domain names, (2) not to store or reproduce this data in \nany way, (3) not to use any high-volume, automated, electronic processes\nto obtain data from this service. Abuse of this service is monitored and\nactions in contravention of these terms will result in being permanently\nblacklisted. All data is (c) CentralNic Ltd https://www.centralnic.com/\n\nDomain ID:CNIC-DO949898\nDomain Name:NIC.PW\nCreated On:2012-10-12T10:19:46.0Z\nLast Updated On:2013-04-30T15:06:57.0Z\nExpiration Date:2020-01-01T23:59:59.0Z\nStatus:OK\nRegistrant ID:H2661317\nRegistrant Name:Registry Manager\nRegistrant Organization:.PW Registry\nRegistrant Street1:N/A\nRegistrant City:N/A\nRegistrant State/Province:N/A\nRegistrant Postal Code:N/A\nRegistrant Country:PW\nRegistrant Phone:\nRegistrant Email:contact@registry.pw\nAdmin ID:H2661317\nAdmin Name:Registry Manager\nAdmin Organization:.PW Registry\nAdmin Street1:N/A\nAdmin City:N/A\nAdmin State/Province:N/A\nAdmin Postal Code:N/A\nAdmin Country:PW\nAdmin Phone:\nAdmin Email:contact@registry.pw\nTech ID:H2661317\nTech Name:Registry Manager\nTech Organization:.PW Registry\nTech Street1:N/A\nTech City:N/A\nTech State/Province:N/A\nTech Postal Code:N/A\nTech Country:PW\nTech Phone:\nTech Email:contact@registry.pw\nBilling ID:H2661317\nBilling Name:Registry Manager\nBilling Organization:.PW Registry\nBilling Street1:N/A\nBilling City:N/A\nBilling State/Province:N/A\nBilling Postal Code:N/A\nBilling Country:PW\nBilling Phone:\nBilling Email:contact@registry.pw\nSponsoring Registrar ID:H2661317\nSponsoring Registrar Organization:.PW Registry\nSponsoring Registrar Street1:N/A\nSponsoring Registrar City:N/A\nSponsoring Registrar State/Province:N/A\nSponsoring Registrar Postal Code:N/A\nSponsoring Registrar Country:PW\nSponsoring Registrar Phone:N/A\nSponsoring Registrar Website:http://www.registry.pw\nName Server:NS0.CENTRALNIC-DNS.COM\nName Server:NS1.CENTRALNIC-DNS.COM\nName Server:NS2.CENTRALNIC-DNS.COM\nName Server:NS3.CENTRALNIC-DNS.COM\nName Server:NS4.CENTRALNIC-DNS.COM\nName Server:NS5.CENTRALNIC-DNS.COM\nDNSSEC:Unsigned\n\n\n\n"], "whois_server": null, "registrar": [".PW Registry"], "name_servers": ["ns0.centralnic-dns.com", "ns1.centralnic-dns.com", "ns2.centralnic-dns.com", "ns3.centralnic-dns.com", "ns4.centralnic-dns.com", "ns5.centralnic-dns.com"], "creation_date": ["2012-10-12T10:19:46", "2012-10-12T10:19:46", "2012-10-12T10:19:46"], "id": ["CNIC-DO949898"]} \ No newline at end of file +{"status": ["OK"], "updated_date": ["2013-04-30T15:06:57"], "contacts": {"admin": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/a", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "tech": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/a", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "registrant": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/a", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "billing": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/a", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}}, "expiration_date": ["2020-01-01T23:59:59"], "emails": [], "raw": ["This whois service is provided by CentralNic Ltd and only contains\ninformation pertaining to Internet domain names we have registered for\nour customers. By using this service you are agreeing (1) not to use any\ninformation presented here for any purpose other than determining\nownership of domain names, (2) not to store or reproduce this data in \nany way, (3) not to use any high-volume, automated, electronic processes\nto obtain data from this service. Abuse of this service is monitored and\nactions in contravention of these terms will result in being permanently\nblacklisted. All data is (c) CentralNic Ltd https://www.centralnic.com/\n\nDomain ID:CNIC-DO949898\nDomain Name:NIC.PW\nCreated On:2012-10-12T10:19:46.0Z\nLast Updated On:2013-04-30T15:06:57.0Z\nExpiration Date:2020-01-01T23:59:59.0Z\nStatus:OK\nRegistrant ID:H2661317\nRegistrant Name:Registry Manager\nRegistrant Organization:.PW Registry\nRegistrant Street1:N/A\nRegistrant City:N/A\nRegistrant State/Province:N/A\nRegistrant Postal Code:N/A\nRegistrant Country:PW\nRegistrant Phone:\nRegistrant Email:contact@registry.pw\nAdmin ID:H2661317\nAdmin Name:Registry Manager\nAdmin Organization:.PW Registry\nAdmin Street1:N/A\nAdmin City:N/A\nAdmin State/Province:N/A\nAdmin Postal Code:N/A\nAdmin Country:PW\nAdmin Phone:\nAdmin Email:contact@registry.pw\nTech ID:H2661317\nTech Name:Registry Manager\nTech Organization:.PW Registry\nTech Street1:N/A\nTech City:N/A\nTech State/Province:N/A\nTech Postal Code:N/A\nTech Country:PW\nTech Phone:\nTech Email:contact@registry.pw\nBilling ID:H2661317\nBilling Name:Registry Manager\nBilling Organization:.PW Registry\nBilling Street1:N/A\nBilling City:N/A\nBilling State/Province:N/A\nBilling Postal Code:N/A\nBilling Country:PW\nBilling Phone:\nBilling Email:contact@registry.pw\nSponsoring Registrar ID:H2661317\nSponsoring Registrar Organization:.PW Registry\nSponsoring Registrar Street1:N/A\nSponsoring Registrar City:N/A\nSponsoring Registrar State/Province:N/A\nSponsoring Registrar Postal Code:N/A\nSponsoring Registrar Country:PW\nSponsoring Registrar Phone:N/A\nSponsoring Registrar Website:http://www.registry.pw\nName Server:NS0.CENTRALNIC-DNS.COM\nName Server:NS1.CENTRALNIC-DNS.COM\nName Server:NS2.CENTRALNIC-DNS.COM\nName Server:NS3.CENTRALNIC-DNS.COM\nName Server:NS4.CENTRALNIC-DNS.COM\nName Server:NS5.CENTRALNIC-DNS.COM\nDNSSEC:Unsigned\n\n\n\n"], "whois_server": null, "registrar": [".PW Registry"], "name_servers": ["ns0.centralnic-dns.com", "ns1.centralnic-dns.com", "ns2.centralnic-dns.com", "ns3.centralnic-dns.com", "ns4.centralnic-dns.com", "ns5.centralnic-dns.com"], "creation_date": ["2012-10-12T10:19:46", "2012-10-12T10:19:46", "2012-10-12T10:19:46"], "id": ["CNIC-DO949898"]} \ No newline at end of file diff --git a/test/target_normalized/ovh.fr b/test/target_normalized/ovh.fr index c25f4f5..a8bc096 100644 --- a/test/target_normalized/ovh.fr +++ b/test/target_normalized/ovh.fr @@ -1 +1 @@ -{"status": ["Active", "ok"], "updated_date": ["2006-10-11T00:00:00", "2013-10-28T00:00:00", "2009-04-03T00:00:00"], "contacts": {"admin": {"fax": "+33 3 20 20 09 58", "handle": "OK62-FRNIC", "phone": "+33 3 20 20 09 57", "street": "Sarl Ovh\n140, Quai Du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "Octave Klaba", "country": "FR", "type": "PERSON", "changedate": "2009-04-03T00:00:00"}, "tech": {"handle": "OVH5-FRNIC", "phone": "+33 8 99 70 17 61", "street": "Ovh\n140, Quai Du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "Ovh Net", "country": "FR", "type": "ROLE", "email": "tech@ovh.net", "changedate": "2006-10-11T00:00:00"}, "registrant": {"fax": "+33 3 20 20 09 58", "handle": "SO255-FRNIC", "phone": "+33 8 99 70 17 61", "street": "140, Quai Du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "Ovh Sas", "country": "FR", "type": "ORGANIZATION", "email": "oles@ovh.net", "changedate": "2013-10-28T00:00:00"}, "billing": null}, "expiration_date": null, "id": null, "creation_date": ["1999-11-12T00:00:00", "1999-10-21T00:00:00"], "raw": ["%%\n%% This is the AFNIC Whois server.\n%%\n%% complete date format : DD/MM/YYYY\n%% short date format : DD/MM\n%% version : FRNIC-2.5\n%%\n%% Rights restricted by copyright.\n%% See http://www.afnic.fr/afnic/web/mentions-legales-whois_en\n%%\n%% Use '-h' option to obtain more information about this service.\n%%\n%% [77.162.55.23 REQUEST] >> -V Md5.0 ovh.fr\n%%\n%% RL Net [##########] - RL IP [#########.]\n%%\n\ndomain: ovh.fr\nstatus: ACTIVE\nhold: NO\nholder-c: SO255-FRNIC\nadmin-c: OK62-FRNIC\ntech-c: OVH5-FRNIC\nzone-c: NFC1-FRNIC\nnsl-id: NSL16790-FRNIC\nregistrar: OVH\nanniversary: 12/11\ncreated: 12/11/1999\nlast-update: 03/04/2009\nsource: FRNIC\n\nns-list: NSL16790-FRNIC\nnserver: dns.ovh.net\nnserver: dns10.ovh.net\nnserver: ns.ovh.net\nnserver: ns10.ovh.net\nsource: FRNIC\n\nregistrar: OVH\ntype: Isp Option 1\naddress: 2 Rue Kellermann\naddress: ROUBAIX\ncountry: FR\nphone: +33 8 99 70 17 61\nfax-no: +33 3 20 20 09 58\ne-mail: support@ovh.net\nwebsite: http://www.ovh.com\nanonymous: NO\nregistered: 21/10/1999\nsource: FRNIC\n\nnic-hdl: OVH5-FRNIC\ntype: ROLE\ncontact: OVH NET\naddress: OVH\naddress: 140, quai du Sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 8 99 70 17 61\ne-mail: tech@ovh.net\ntrouble: Information: http://www.ovh.fr\ntrouble: Questions: mailto:tech@ovh.net\ntrouble: Spam: mailto:abuse@ovh.net\nadmin-c: OK217-FRNIC\ntech-c: OK217-FRNIC\nnotify: tech@ovh.net\nregistrar: OVH\nchanged: 11/10/2006 tech@ovh.net\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n\nnic-hdl: SO255-FRNIC\ntype: ORGANIZATION\ncontact: OVH SAS\naddress: 140, quai du sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 8 99 70 17 61\nfax-no: +33 3 20 20 09 58\ne-mail: oles@ovh.net\nregistrar: OVH\nchanged: 28/10/2013 nic@nic.fr\nanonymous: NO\nobsoleted: NO\neligstatus: ok\neligdate: 01/09/2011 12:03:35\nsource: FRNIC\n\nnic-hdl: OK62-FRNIC\ntype: PERSON\ncontact: Octave Klaba\naddress: Sarl Ovh\naddress: 140, quai du Sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 3 20 20 09 57\nfax-no: +33 3 20 20 09 58\nregistrar: OVH\nchanged: 03/04/2009 nic@nic.fr\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n"], "whois_server": null, "registrar": ["Ovh"], "name_servers": ["dns.ovh.net", "dns10.ovh.net", "ns.ovh.net", "ns10.ovh.net"], "emails": ["support@ovh.net", "abuse@ovh.net", "nic@nic.fr"]} \ No newline at end of file +{"status": ["Active", "ok"], "updated_date": ["2006-10-11T00:00:00", "2013-10-28T00:00:00", "2009-04-03T00:00:00"], "contacts": {"admin": {"fax": "+33 3 20 20 09 58", "handle": "OK62-FRNIC", "phone": "+33 3 20 20 09 57", "street": "Sarl Ovh\n140, Quai Du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "Octave Klaba", "country": "FR", "type": "PERSON", "changedate": "2009-04-03T00:00:00"}, "tech": {"handle": "OVH5-FRNIC", "phone": "+33 8 99 70 17 61", "street": "Ovh\n140, Quai Du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "Ovh Net", "country": "FR", "type": "ROLE", "email": "tech@ovh.net", "changedate": "2006-10-11T00:00:00"}, "registrant": {"fax": "+33 3 20 20 09 58", "handle": "SO255-FRNIC", "phone": "+33 8 99 70 17 61", "street": "140, Quai Du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "Ovh Sas", "country": "FR", "type": "ORGANIZATION", "email": "oles@ovh.net", "changedate": "2013-10-28T00:00:00"}, "billing": null}, "expiration_date": null, "id": null, "creation_date": ["1999-11-12T00:00:00", "1999-10-21T00:00:00"], "raw": ["%%\n%% This is the AFNIC Whois server.\n%%\n%% complete date format : DD/MM/YYYY\n%% short date format : DD/MM\n%% version : FRNIC-2.5\n%%\n%% Rights restricted by copyright.\n%% See http://www.afnic.fr/afnic/web/mentions-legales-whois_en\n%%\n%% Use '-h' option to obtain more information about this service.\n%%\n%% [77.162.55.23 REQUEST] >> -V Md5.0 ovh.fr\n%%\n%% RL Net [##########] - RL IP [#########.]\n%%\n\ndomain: ovh.fr\nstatus: ACTIVE\nhold: NO\nholder-c: SO255-FRNIC\nadmin-c: OK62-FRNIC\ntech-c: OVH5-FRNIC\nzone-c: NFC1-FRNIC\nnsl-id: NSL16790-FRNIC\nregistrar: OVH\nanniversary: 12/11\ncreated: 12/11/1999\nlast-update: 03/04/2009\nsource: FRNIC\n\nns-list: NSL16790-FRNIC\nnserver: dns.ovh.net\nnserver: dns10.ovh.net\nnserver: ns.ovh.net\nnserver: ns10.ovh.net\nsource: FRNIC\n\nregistrar: OVH\ntype: Isp Option 1\naddress: 2 Rue Kellermann\naddress: ROUBAIX\ncountry: FR\nphone: +33 8 99 70 17 61\nfax-no: +33 3 20 20 09 58\ne-mail: support@ovh.net\nwebsite: http://www.ovh.com\nanonymous: NO\nregistered: 21/10/1999\nsource: FRNIC\n\nnic-hdl: OVH5-FRNIC\ntype: ROLE\ncontact: OVH NET\naddress: OVH\naddress: 140, quai du Sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 8 99 70 17 61\ne-mail: tech@ovh.net\ntrouble: Information: http://www.ovh.fr\ntrouble: Questions: mailto:tech@ovh.net\ntrouble: Spam: mailto:abuse@ovh.net\nadmin-c: OK217-FRNIC\ntech-c: OK217-FRNIC\nnotify: tech@ovh.net\nregistrar: OVH\nchanged: 11/10/2006 tech@ovh.net\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n\nnic-hdl: SO255-FRNIC\ntype: ORGANIZATION\ncontact: OVH SAS\naddress: 140, quai du sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 8 99 70 17 61\nfax-no: +33 3 20 20 09 58\ne-mail: oles@ovh.net\nregistrar: OVH\nchanged: 28/10/2013 nic@nic.fr\nanonymous: NO\nobsoleted: NO\neligstatus: ok\neligdate: 01/09/2011 12:03:35\nsource: FRNIC\n\nnic-hdl: OK62-FRNIC\ntype: PERSON\ncontact: Octave Klaba\naddress: Sarl Ovh\naddress: 140, quai du Sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 3 20 20 09 57\nfax-no: +33 3 20 20 09 58\nregistrar: OVH\nchanged: 03/04/2009 nic@nic.fr\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n"], "whois_server": null, "registrar": ["OVH"], "name_servers": ["dns.ovh.net", "dns10.ovh.net", "ns.ovh.net", "ns10.ovh.net"], "emails": ["support@ovh.net", "abuse@ovh.net", "nic@nic.fr"]} \ No newline at end of file