Don't pick up the update date for the WHOIS database, only for the actual domain. Fixes #39.

pythonwhois/parse.py

@@ -127,8 +127,7 @@ grammar = {
 					 'Last updated on (?P<val>.+) [a-z]{3,4}',
 					 'Last updated:\s*(?P<val>.+)',
 					 'last-updated:\s*(?P<val>.+)',
-					 '\[Last Update\]\s*(?P<val>.+) \([A-Z]+\)',
-					 'Last update of whois database:\s?[a-z]{3}, (?P<val>.+) [a-z]{3,4}'],
+					 '\[Last Update\]\s*(?P<val>.+) \([A-Z]+\)'],
 		'registrar':		['registrar:\s*(?P<val>.+)',
 					 'Registrar:\s*(?P<val>.+)',
 					 'Sponsoring Registrar Organization:\s*(?P<val>.+)',

test/target_default/cryto.net

@@ -1 +1 @@
-{"status": ["clientTransferProhibited"], "updated_date": ["2013-02-11T00:00:00", "2013-11-20T04:12:42"], "contacts": {"admin": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "tech": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "registrant": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "billing": null}, "nameservers": ["ns1.he.net", "ns2.he.net", "ns3.he.net", "ns4.he.net", "ns5.he.net"], "expiration_date": ["2014-02-14T00:00:00"], "creation_date": ["2010-02-14T00:00:00"], "raw": ["Domain cryto.net\n\nDate Registered: 2010-2-14\nExpiry Date: 2014-2-14\n\nDNS1: ns1.he.net\nDNS2: ns2.he.net\nDNS3: ns3.he.net\nDNS4: ns4.he.net\nDNS5: ns5.he.net\n\nRegistrant\n    Sven Slootweg\n    Email:jamsoftgamedev@gmail.com\n    Wijnstraat 211\n    3311BV Dordrecht\n    Netherlands\n    Tel: +31.626519955\n\nAdministrative Contact\n    Sven Slootweg\n    Email:jamsoftgamedev@gmail.com\n    Wijnstraat 211\n    3311BV Dordrecht\n    Netherlands\n    Tel: +31.626519955\n\nTechnical Contact\n    Sven Slootweg\n    Email:jamsoftgamedev@gmail.com\n    Wijnstraat 211\n    3311BV Dordrecht\n    Netherlands\n    Tel: +31.626519955\n\nRegistrar: Internet.bs Corp.\nRegistrar's Website : <a href='http://www.internetbs.net/'>http://www.internetbs.net/</a>\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: CRYTO.NET\n   Registrar: INTERNET.BS CORP.\n   Whois Server: whois.internet.bs\n   Referral URL: http://www.internet.bs\n   Name Server: NS1.HE.NET\n   Name Server: NS2.HE.NET\n   Name Server: NS3.HE.NET\n   Name Server: NS4.HE.NET\n   Name Server: NS5.HE.NET\n   Status: clientTransferProhibited\n   Updated Date: 11-feb-2013\n   Creation Date: 14-feb-2010\n   Expiration Date: 14-feb-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:12:42 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.internet.bs"], "registrar": ["Internet.bs Corp."]}
+{"status": ["clientTransferProhibited"], "updated_date": ["2013-02-11T00:00:00"], "contacts": {"admin": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "tech": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "registrant": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "billing": null}, "nameservers": ["ns1.he.net", "ns2.he.net", "ns3.he.net", "ns4.he.net", "ns5.he.net"], "expiration_date": ["2014-02-14T00:00:00"], "creation_date": ["2010-02-14T00:00:00"], "raw": ["Domain cryto.net\n\nDate Registered: 2010-2-14\nExpiry Date: 2014-2-14\n\nDNS1: ns1.he.net\nDNS2: ns2.he.net\nDNS3: ns3.he.net\nDNS4: ns4.he.net\nDNS5: ns5.he.net\n\nRegistrant\n    Sven Slootweg\n    Email:jamsoftgamedev@gmail.com\n    Wijnstraat 211\n    3311BV Dordrecht\n    Netherlands\n    Tel: +31.626519955\n\nAdministrative Contact\n    Sven Slootweg\n    Email:jamsoftgamedev@gmail.com\n    Wijnstraat 211\n    3311BV Dordrecht\n    Netherlands\n    Tel: +31.626519955\n\nTechnical Contact\n    Sven Slootweg\n    Email:jamsoftgamedev@gmail.com\n    Wijnstraat 211\n    3311BV Dordrecht\n    Netherlands\n    Tel: +31.626519955\n\nRegistrar: Internet.bs Corp.\nRegistrar's Website : <a href='http://www.internetbs.net/'>http://www.internetbs.net/</a>\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: CRYTO.NET\n   Registrar: INTERNET.BS CORP.\n   Whois Server: whois.internet.bs\n   Referral URL: http://www.internet.bs\n   Name Server: NS1.HE.NET\n   Name Server: NS2.HE.NET\n   Name Server: NS3.HE.NET\n   Name Server: NS4.HE.NET\n   Name Server: NS5.HE.NET\n   Status: clientTransferProhibited\n   Updated Date: 11-feb-2013\n   Creation Date: 14-feb-2010\n   Expiration Date: 14-feb-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:12:42 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.internet.bs"], "registrar": ["Internet.bs Corp."]}

test/target_normalized/cryto.net

@@ -1 +1 @@
-{"status": ["clientTransferProhibited"], "updated_date": ["2013-02-11T00:00:00", "2013-11-20T04:12:42"], "contacts": {"admin": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "tech": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "registrant": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "billing": null}, "nameservers": ["ns1.he.net", "ns2.he.net", "ns3.he.net", "ns4.he.net", "ns5.he.net"], "expiration_date": ["2014-02-14T00:00:00"], "creation_date": ["2010-02-14T00:00:00"], "raw": ["Domain cryto.net\n\nDate Registered: 2010-2-14\nExpiry Date: 2014-2-14\n\nDNS1: ns1.he.net\nDNS2: ns2.he.net\nDNS3: ns3.he.net\nDNS4: ns4.he.net\nDNS5: ns5.he.net\n\nRegistrant\n    Sven Slootweg\n    Email:jamsoftgamedev@gmail.com\n    Wijnstraat 211\n    3311BV Dordrecht\n    Netherlands\n    Tel: +31.626519955\n\nAdministrative Contact\n    Sven Slootweg\n    Email:jamsoftgamedev@gmail.com\n    Wijnstraat 211\n    3311BV Dordrecht\n    Netherlands\n    Tel: +31.626519955\n\nTechnical Contact\n    Sven Slootweg\n    Email:jamsoftgamedev@gmail.com\n    Wijnstraat 211\n    3311BV Dordrecht\n    Netherlands\n    Tel: +31.626519955\n\nRegistrar: Internet.bs Corp.\nRegistrar's Website : <a href='http://www.internetbs.net/'>http://www.internetbs.net/</a>\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: CRYTO.NET\n   Registrar: INTERNET.BS CORP.\n   Whois Server: whois.internet.bs\n   Referral URL: http://www.internet.bs\n   Name Server: NS1.HE.NET\n   Name Server: NS2.HE.NET\n   Name Server: NS3.HE.NET\n   Name Server: NS4.HE.NET\n   Name Server: NS5.HE.NET\n   Status: clientTransferProhibited\n   Updated Date: 11-feb-2013\n   Creation Date: 14-feb-2010\n   Expiration Date: 14-feb-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:12:42 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.internet.bs"], "registrar": ["Internet.bs Corp."]}
+{"status": ["clientTransferProhibited"], "updated_date": ["2013-02-11T00:00:00"], "contacts": {"admin": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "tech": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "registrant": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "billing": null}, "nameservers": ["ns1.he.net", "ns2.he.net", "ns3.he.net", "ns4.he.net", "ns5.he.net"], "expiration_date": ["2014-02-14T00:00:00"], "creation_date": ["2010-02-14T00:00:00"], "raw": ["Domain cryto.net\n\nDate Registered: 2010-2-14\nExpiry Date: 2014-2-14\n\nDNS1: ns1.he.net\nDNS2: ns2.he.net\nDNS3: ns3.he.net\nDNS4: ns4.he.net\nDNS5: ns5.he.net\n\nRegistrant\n    Sven Slootweg\n    Email:jamsoftgamedev@gmail.com\n    Wijnstraat 211\n    3311BV Dordrecht\n    Netherlands\n    Tel: +31.626519955\n\nAdministrative Contact\n    Sven Slootweg\n    Email:jamsoftgamedev@gmail.com\n    Wijnstraat 211\n    3311BV Dordrecht\n    Netherlands\n    Tel: +31.626519955\n\nTechnical Contact\n    Sven Slootweg\n    Email:jamsoftgamedev@gmail.com\n    Wijnstraat 211\n    3311BV Dordrecht\n    Netherlands\n    Tel: +31.626519955\n\nRegistrar: Internet.bs Corp.\nRegistrar's Website : <a href='http://www.internetbs.net/'>http://www.internetbs.net/</a>\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: CRYTO.NET\n   Registrar: INTERNET.BS CORP.\n   Whois Server: whois.internet.bs\n   Referral URL: http://www.internet.bs\n   Name Server: NS1.HE.NET\n   Name Server: NS2.HE.NET\n   Name Server: NS3.HE.NET\n   Name Server: NS4.HE.NET\n   Name Server: NS5.HE.NET\n   Status: clientTransferProhibited\n   Updated Date: 11-feb-2013\n   Creation Date: 14-feb-2010\n   Expiration Date: 14-feb-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:12:42 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.internet.bs"], "registrar": ["Internet.bs Corp."]}