--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/samples/expected/davidwalsh.name Sat Dec 09 00:23:40 2017 +0100
@@ -0,0 +1,1 @@
+{"domain_name": "DAVIDWALSH.NAME", "expiration_date": null, "updated_date": null, "creation_date": null, "status": "clientTransferProhibited https://icann.org/epp#clientTransferProhibited"}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/samples/expected/marktplaats.nl Sat Dec 09 00:23:40 2017 +0100
@@ -0,0 +1,1 @@
+{"domain_name": "marktplaats.nl", "expiration_date": null, "updated_date": null, "creation_date": null, "status": "active"}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/samples/expected/yandex.ru Sat Dec 09 00:23:40 2017 +0100
@@ -0,0 +1,1 @@
+{"domain_name": "YANDEX.RU", "expiration_date": "2018-09-30 21:00:00", "updated_date": null, "creation_date": "1997-09-23 09:45:07", "status": "REGISTERED, DELEGATED, VERIFIED"}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/samples/whois/davidwalsh.name Sat Dec 09 00:23:40 2017 +0100
@@ -0,0 +1,35 @@
+
+Disclaimer: VeriSign, Inc. makes every effort to maintain the
+completeness and accuracy of the Whois data, but cannot guarantee
+that the results are error-free. Therefore, any data provided
+through the Whois service are on an as is basis without any
+warranties.
+BY USING THE WHOIS SERVICE AND THE DATA CONTAINED
+HEREIN OR IN ANY REPORT GENERATED WITH RESPECT THERETO, IT IS
+ACCEPTED THAT VERISIGN, INC. IS NOT LIABLE FOR
+ANY DAMAGES OF ANY KIND ARISING OUT OF, OR IN CONNECTION WITH, THE
+REPORT OR THE INFORMATION PROVIDED BY THE WHOIS SERVICE, NOR
+OMISSIONS OR MISSING INFORMATION. THE RESULTS OF ANY WHOIS REPORT OR
+INFORMATION PROVIDED BY THE WHOIS SERVICE CANNOT BE RELIED UPON IN
+CONTEMPLATION OF LEGAL PROCEEDINGS WITHOUT FURTHER VERIFICATION, NOR
+DO SUCH RESULTS CONSTITUTE A LEGAL OPINION. Acceptance of the
+results of the Whois constitutes acceptance of these terms,
+conditions and limitations. Whois data may be requested only for
+lawful purposes, in particular, to protect legal rights and
+obligations. Illegitimate uses of Whois data include, but are not
+limited to, unsolicited email, data mining, direct marketing or any
+other improper purpose. Any request made for Whois data will be
+documented by VeriSign, Inc. but will not be used for any commercial purpose whatsoever.
+
+ ****
+
+ Registry Domain ID: 2852634_DOMAIN_NAME-VRSN
+ Domain Name: DAVIDWALSH.NAME
+ Registrar: Name.com, Inc.
+ Registrar IANA ID: 625
+ Domain Status: clientTransferProhibited https://icann.org/epp#clientTransferProhibited
+
+>>> Last update of whois database: 2017-12-08T23:02:21Z <<<
+
+For more information on Whois status codes, please visit https://icann.org/epp
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/samples/whois/marktplaats.nl Sat Dec 09 00:23:40 2017 +0100
@@ -0,0 +1,48 @@
+Domain name: marktplaats.nl
+Status: active
+
+Registrar:
+ MarkMonitor Inc.
+ 3540 East Longwing Lane
+ Suite 300
+ 83646 Meridian
+ United States of America
+
+Abuse Contact:
+
+DNSSEC: no
+
+Domain nameservers:
+ ns4.p13.dynect.net
+ ns1.p13.dynect.net
+ ns3.p13.dynect.net
+ ns2.p13.dynect.net
+
+Record maintained by: NL Domain Registry
+
+As the registrant's address is not in the Netherlands, the registrant is
+obliged by the General Terms and Conditions for .nl Registrants to use
+SIDN's registered office address as a domicile address. More information
+on the use of a domicile address may be found at
+https://www.sidn.nl/downloads/procedures/Domicile_address.pdf
+
+
+Copyright notice
+No part of this publication may be reproduced, published, stored in a
+retrieval system, or transmitted, in any form or by any means,
+electronic, mechanical, recording, or otherwise, without prior
+permission of the Foundation for Internet Domain Registration in the
+Netherlands (SIDN).
+These restrictions apply equally to registrars, except in that
+reproductions and publications are permitted insofar as they are
+reasonable, necessary and solely in the context of the registration
+activities referred to in the General Terms and Conditions for .nl
+Registrars.
+Any use of this material for advertising, targeting commercial offers or
+similar activities is explicitly forbidden and liable to result in legal
+action. Anyone who is aware or suspects that such activities are taking
+place is asked to inform the Foundation for Internet Domain Registration
+in the Netherlands.
+(c) The Foundation for Internet Domain Registration in the Netherlands
+(SIDN) Dutch Copyright Act, protection of authors' rights (Section 10,
+subsection 1, clause 1).
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/samples/whois/yandex.ru Sat Dec 09 00:23:40 2017 +0100
@@ -0,0 +1,20 @@
+% By submitting a query to RIPN's Whois Service
+% you agree to abide by the following terms of use:
+% http://www.ripn.net/about/servpol.html#3.2 (in Russian)
+% http://www.ripn.net/about/en/servpol.html#3.2 (in English).
+
+domain: YANDEX.RU
+nserver: ns1.yandex.ru. 213.180.193.1, 2a02:6b8::1
+nserver: ns2.yandex.ru. 93.158.134.1, 2a02:6b8:0:1::1
+nserver: ns9.z5h64q92x9.net.
+state: REGISTERED, DELEGATED, VERIFIED
+org: YANDEX, LLC.
+registrar: RU-CENTER-RU
+admin-contact: https://www.nic.ru/whois
+created: 1997-09-23T09:45:07Z
+paid-till: 2018-09-30T21:00:00Z
+free-date: 2018-11-01
+source: TCI
+
+Last updated on 2017-12-08T22:51:30Z
+
--- a/whois/parser.py Fri Dec 08 23:52:45 2017 +0100
+++ b/whois/parser.py Sat Dec 09 00:23:40 2017 +0100
@@ -324,6 +324,7 @@
'registrar': 'registrar: *(.+)',
'creation_date': 'created: *(.+)',
'expiration_date': 'paid-till: *(.+)',
+ 'updated_date': None,
'name_servers': 'nserver: *(.+)', # list of name servers
'status': 'state: *(.+)', # list of statuses
'emails': EMAIL_REGEX, # list of email addresses
@@ -341,6 +342,11 @@
"""Whois parser for .nl domains
"""
regex = {
+ 'domain_name': 'Domain Name: *(.+)',
+ 'expiration_date': None,
+ 'updated_date': None,
+ 'creation_date': None,
+ 'status': 'Status: *(.+)', # list of statuses
'name': None,
'address': None,
'zip_code': None,