From 80fb22aa4f6e7e931f827ba29f529530a2da5f42 Mon Sep 17 00:00:00 2001 From: joe doe Date: Tue, 18 Feb 2014 14:56:19 +0100 Subject: [PATCH] added .de region specific support --- pythonwhois/net.py | 2 + test/data/test.de | 69 ++++++++++++++++++++++++++++++++++ test/domains.txt | 1 + test/target_default/test.de | 1 + test/target_normalized/test.de | 1 + 5 files changed, 74 insertions(+) create mode 100644 test/data/test.de create mode 100644 test/target_default/test.de create mode 100644 test/target_normalized/test.de diff --git a/pythonwhois/net.py b/pythonwhois/net.py index 3021beb..1b2103d 100644 --- a/pythonwhois/net.py +++ b/pythonwhois/net.py @@ -9,6 +9,8 @@ def get_whois_raw(domain, server="", previous=[]): target_server = server if domain.endswith(".jp") and target_server == "whois.jprs.jp": request_domain = "%s/e" % domain # Suppress Japanese output + elif domain.endswith(".de"): + request_domain = "-T dn,ace -C US-ASCII %s" % domain # regional specific stuff elif target_server == "whois.verisign-grs.com": request_domain = "=%s" % domain # Avoid partial matches else: diff --git a/test/data/test.de b/test/data/test.de new file mode 100644 index 0000000..24ba15d --- /dev/null +++ b/test/data/test.de @@ -0,0 +1,69 @@ +% Copyright (c) 2010 by DENIC +% Version: 2.0 +% +% Restricted rights. +% +% Terms and Conditions of Use +% +% The data in this record is provided by DENIC for informational purposes only. +% DENIC does not guarantee its accuracy and cannot, under any circumstances, +% be held liable in case the stored information would prove to be wrong, +% incomplete or not accurate in any sense. +% +% All the domain data that is visible in the whois service is protected by law. +% It is not permitted to use it for any purpose other than technical or +% administrative requirements associated with the operation of the Internet. +% It is explicitly forbidden to extract, copy and/or use or re-utilise in any +% form and by any means (electronically or not) the whole or a quantitatively +% or qualitatively substantial part of the contents of the whois database +% without prior and explicit written permission by DENIC. +% It is prohibited, in particular, to use it for transmission of unsolicited +% and/or commercial and/or advertising by phone, fax, e-mail or for any similar +% purposes. +% +% By maintaining the connection you assure that you have a legitimate interest +% in the data and that you will only use it for the stated purposes. You are +% aware that DENIC maintains the right to initiate legal proceedings against +% you in the event of any breach of this assurance and to bar you from using +% its whois service. +% +% The DENIC whois service on port 43 never discloses any information concerning +% the domain holder/administrative contact. Information concerning the domain +% holder/administrative contact can be obtained through use of our web-based +% whois service available at the DENIC website: +% http://www.denic.de/en/domains/whois-service/web-whois.html +% + +Domain: test.de +Nserver: dns.iwelt-ag.net +Nserver: dns2.iwelt-ag.net +Nserver: dns3.iwelt-ag.de +Status: connect +Changed: 2013-04-10T11:11:41+02:00 + +[Tech-C] +Type: PERSON +Name: Christian Zantop +Organisation: Stiftung Warentest +Address: Luetzowplatz 11-13 +PostalCode: 10785 +City: Berlin +CountryCode: DE +Phone: +49.3026312604 +Fax: +49.3026312342 +Email: webmaster@stiftung-warentest.de +Changed: 2013-03-19T14:16:18+01:00 + +[Zone-C] +Type: ROLE +Name: Domainservice +Organisation: iWelt AG +Address: Mainparkring 4 +PostalCode: 97246 +City: Eibelstadt +CountryCode: DE +Phone: +49.9303982860 +Fax: +49.9303982879 +Email: support@iwelt.de +Changed: 2013-08-05T11:43:45+02:00 + diff --git a/test/domains.txt b/test/domains.txt index 8263889..8db0525 100644 --- a/test/domains.txt +++ b/test/domains.txt @@ -43,3 +43,4 @@ tpc.int keybase.io whois.us freebnc.net +test.de diff --git a/test/target_default/test.de b/test/target_default/test.de new file mode 100644 index 0000000..8623077 --- /dev/null +++ b/test/target_default/test.de @@ -0,0 +1 @@ +{"status": ["connect"], "updated_date": ["2013-04-10T11:11:41", "2013-03-19T14:16:18", "2013-08-05T11:43:45"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "nameservers": ["dns.iwelt-ag.net", "dns2.iwelt-ag.net", "dns3.iwelt-ag.de"], "raw": ["% Copyright (c) 2010 by DENIC\n% Version: 2.0\n% \n% Restricted rights.\n% \n% Terms and Conditions of Use\n% \n% The data in this record is provided by DENIC for informational purposes only.\n% DENIC does not guarantee its accuracy and cannot, under any circumstances,\n% be held liable in case the stored information would prove to be wrong,\n% incomplete or not accurate in any sense.\n% \n% All the domain data that is visible in the whois service is protected by law.\n% It is not permitted to use it for any purpose other than technical or\n% administrative requirements associated with the operation of the Internet.\n% It is explicitly forbidden to extract, copy and/or use or re-utilise in any\n% form and by any means (electronically or not) the whole or a quantitatively\n% or qualitatively substantial part of the contents of the whois database\n% without prior and explicit written permission by DENIC.\n% It is prohibited, in particular, to use it for transmission of unsolicited\n% and/or commercial and/or advertising by phone, fax, e-mail or for any similar\n% purposes.\n% \n% By maintaining the connection you assure that you have a legitimate interest\n% in the data and that you will only use it for the stated purposes. You are\n% aware that DENIC maintains the right to initiate legal proceedings against\n% you in the event of any breach of this assurance and to bar you from using\n% its whois service.\n% \n% The DENIC whois service on port 43 never discloses any information concerning\n% the domain holder/administrative contact. Information concerning the domain\n% holder/administrative contact can be obtained through use of our web-based\n% whois service available at the DENIC website:\n% http://www.denic.de/en/domains/whois-service/web-whois.html\n% \n\nDomain: test.de\nNserver: dns.iwelt-ag.net\nNserver: dns2.iwelt-ag.net\nNserver: dns3.iwelt-ag.de\nStatus: connect\nChanged: 2013-04-10T11:11:41+02:00\n\n[Tech-C]\nType: PERSON\nName: Christian Zantop\nOrganisation: Stiftung Warentest\nAddress: Luetzowplatz 11-13\nPostalCode: 10785\nCity: Berlin\nCountryCode: DE\nPhone: +49.3026312604\nFax: +49.3026312342\nEmail: webmaster@stiftung-warentest.de\nChanged: 2013-03-19T14:16:18+01:00\n\n[Zone-C]\nType: ROLE\nName: Domainservice\nOrganisation: iWelt AG\nAddress: Mainparkring 4\nPostalCode: 97246\nCity: Eibelstadt\nCountryCode: DE\nPhone: +49.9303982860\nFax: +49.9303982879\nEmail: support@iwelt.de\nChanged: 2013-08-05T11:43:45+02:00\n\n"], "emails": ["webmaster@stiftung-warentest.de", "support@iwelt.de"]} \ No newline at end of file diff --git a/test/target_normalized/test.de b/test/target_normalized/test.de new file mode 100644 index 0000000..c403680 --- /dev/null +++ b/test/target_normalized/test.de @@ -0,0 +1 @@ +{"status": ["Connect"], "updated_date": ["2013-04-10T11:11:41", "2013-03-19T14:16:18", "2013-08-05T11:43:45"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "nameservers": ["dns.iwelt-ag.net", "dns2.iwelt-ag.net", "dns3.iwelt-ag.de"], "raw": ["% Copyright (c) 2010 by DENIC\n% Version: 2.0\n% \n% Restricted rights.\n% \n% Terms and Conditions of Use\n% \n% The data in this record is provided by DENIC for informational purposes only.\n% DENIC does not guarantee its accuracy and cannot, under any circumstances,\n% be held liable in case the stored information would prove to be wrong,\n% incomplete or not accurate in any sense.\n% \n% All the domain data that is visible in the whois service is protected by law.\n% It is not permitted to use it for any purpose other than technical or\n% administrative requirements associated with the operation of the Internet.\n% It is explicitly forbidden to extract, copy and/or use or re-utilise in any\n% form and by any means (electronically or not) the whole or a quantitatively\n% or qualitatively substantial part of the contents of the whois database\n% without prior and explicit written permission by DENIC.\n% It is prohibited, in particular, to use it for transmission of unsolicited\n% and/or commercial and/or advertising by phone, fax, e-mail or for any similar\n% purposes.\n% \n% By maintaining the connection you assure that you have a legitimate interest\n% in the data and that you will only use it for the stated purposes. You are\n% aware that DENIC maintains the right to initiate legal proceedings against\n% you in the event of any breach of this assurance and to bar you from using\n% its whois service.\n% \n% The DENIC whois service on port 43 never discloses any information concerning\n% the domain holder/administrative contact. Information concerning the domain\n% holder/administrative contact can be obtained through use of our web-based\n% whois service available at the DENIC website:\n% http://www.denic.de/en/domains/whois-service/web-whois.html\n% \n\nDomain: test.de\nNserver: dns.iwelt-ag.net\nNserver: dns2.iwelt-ag.net\nNserver: dns3.iwelt-ag.de\nStatus: connect\nChanged: 2013-04-10T11:11:41+02:00\n\n[Tech-C]\nType: PERSON\nName: Christian Zantop\nOrganisation: Stiftung Warentest\nAddress: Luetzowplatz 11-13\nPostalCode: 10785\nCity: Berlin\nCountryCode: DE\nPhone: +49.3026312604\nFax: +49.3026312342\nEmail: webmaster@stiftung-warentest.de\nChanged: 2013-03-19T14:16:18+01:00\n\n[Zone-C]\nType: ROLE\nName: Domainservice\nOrganisation: iWelt AG\nAddress: Mainparkring 4\nPostalCode: 97246\nCity: Eibelstadt\nCountryCode: DE\nPhone: +49.9303982860\nFax: +49.9303982879\nEmail: support@iwelt.de\nChanged: 2013-08-05T11:43:45+02:00\n\n"], "emails": ["webmaster@stiftung-warentest.de", "support@iwelt.de"]} \ No newline at end of file