joepie91
/
python-whois
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Release 2.2.2

Browse Source
master
Sven Slootweg 10 years ago
parent d601179a31 e646a351fd
commit 7bc5949e07
8 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
pythonwhois/parse.py
Unescape Escape View File

@ -11,6 +11,7 @@ grammar = {
'Created on[.]*: [a-zA-Z]+, (?P<val>.+)',
'Creation Date:\s?(?P<val>.+)',
'Creation date\s*:\s?(?P<val>.+)',
'Registration Date:\s?(?P<val>.+)',
'Created Date:\s?(?P<val>.+)',
'Created on:\s?(?P<val>.+)',
'Created on\s?[.]*:\s?(?P<val>.+)\.',
@ -526,6 +527,7 @@ def parse_registrants(data):
" Registrant:\n (?P<name>.+)\n\n Registrant type:\n .*\n\n Registrant's address:\n The registrant .* opted to have", # Nominet (.uk) with hidden address
" Registrant:\n (?P<name>.+)\n\n[\s\S]* Registrant type:\n .*\n\n Registrant's address:\n (?P<street1>.+)\n(?: (?P<street2>.+)\n(?: (?P<street3>.+)\n)??)?? (?P<city>[^0-9\n]+)\n(?: (?P<state>.+)\n)? (?P<postalcode>.+)\n (?P<country>.+)\n\n", # Nominet (.uk) with visible address
"Domain Owner:\n\t(?P<organization>.+)\n\n[\s\S]*?(?:Registrant Contact:\n\t(?P<name>.+))?\n\nRegistrant(?:'s)? (?:a|A)ddress:(?:\n\t(?P<street1>.+)\n(?:\t(?P<street2>.+)\n)?(?:\t(?P<street3>.+)\n)?\t(?P<city>.+)\n\t(?P<postalcode>.+))?\n\t(?P<country>.+)(?:\n\t(?P<phone>.+) \(Phone\)\n\t(?P<fax>.+) \(FAX\)\n\t(?P<email>.+))?\n\n", # .ac.uk - what a mess...
"Registrant ID: (?P<handle>.+)\nRegistrant: (?P<name>.+)\nRegistrant Contact Email: (?P<email>.+)", # .cn (CNNIC)
"Registrant contact:\n (?P<name>.+)\n (?P<street>.*)\n (?P<city>.+), (?P<state>.+) (?P<postalcode>.+) (?P<country>.+)\n\n", # Fabulous.com
"registrant-name:\s*(?P<name>.+)\nregistrant-type:\s*(?P<type>.+)\nregistrant-address:\s*(?P<street>.+)\nregistrant-postcode:\s*(?P<postalcode>.+)\nregistrant-city:\s*(?P<city>.+)\nregistrant-country:\s*(?P<country>.+)\n(?:registrant-phone:\s*(?P<phone>.+)\n)?(?:registrant-email:\s*(?P<email>.+)\n)?", # Hetzner
"Registrant Contact Information :[ ]*\n[ ]+(?P<firstname>.*)\n[ ]+(?P<lastname>.*)\n[ ]+(?P<organization>.*)\n[ ]+(?P<email>.*)\n[ ]+(?P<street>.*)\n[ ]+(?P<city>.*)\n[ ]+(?P<postalcode>.*)\n[ ]+(?P<phone>.*)\n[ ]+(?P<fax>.*)\n\n", # GAL Communication

2
setup.py
Unescape Escape View File

@ -1,7 +1,7 @@
from setuptools import setup
setup(name='pythonwhois',
version='2.2.1',
version='2.2.2',
description='Module for retrieving and parsing the WHOIS data for a domain. Supports most domains. No dependencies.',
author='Sven Slootweg',
author_email='pythonwhois@cryto.net',

20
test/data/google.cn
Unescape Escape View File

@ -0,0 +1,20 @@
Domain Name: google.cn
ROID: 20030311s10001s00033735-cn
Domain Status: clientDeleteProhibited
Domain Status: serverDeleteProhibited
Domain Status: clientUpdateProhibited
Domain Status: serverUpdateProhibited
Domain Status: clientTransferProhibited
Domain Status: serverTransferProhibited
Registrant ID: cnnic-zdmd-022
Registrant: Google Ireland Holdings
Registrant Contact Email: dns-admin@google.com
Sponsoring Registrar: MarkMonitor Inc.
Name Server: ns2.google.com
Name Server: ns1.google.com
Name Server: ns3.google.com
Name Server: ns4.google.com
Registration Date: 2003-03-17 12:20:05
Expiration Date: 2015-03-17 12:48:36
DNSSEC: unsigned

20
test/data/sina.com.cn
Unescape Escape View File

@ -0,0 +1,20 @@
Domain Name: sina.com.cn
ROID: 20021209s10011s00082127-cn
Domain Status: clientDeleteProhibited
Domain Status: serverDeleteProhibited
Domain Status: clientUpdateProhibited
Domain Status: serverUpdateProhibited
Domain Status: clientTransferProhibited
Domain Status: serverTransferProhibited
Registrant ID: sinacomcn2
Registrant: 北京新浪互联信息服务有限公司
Registrant Contact Email: domainname@staff.sina.com.cn
Sponsoring Registrar: 北京新网数码信息技术有限公司
Name Server: ns3.sina.com.cn
Name Server: ns2.sina.com.cn
Name Server: ns4.sina.com.cn
Name Server: ns1.sina.com.cn
Registration Date: 1998-11-20 00:00:00
Expiration Date: 2019-12-04 09:32:35
DNSSEC: unsigned

1
test/target_default/google.cn
Unescape Escape View File

@ -0,0 +1 @@
{"status": ["clientDeleteProhibited", "serverDeleteProhibited", "clientUpdateProhibited", "serverUpdateProhibited", "clientTransferProhibited", "serverTransferProhibited"], "contacts": {"admin": null, "tech": null, "registrant": {"handle": "cnnic-zdmd-022", "name": "Google Ireland Holdings", "email": "dns-admin@google.com"}, "billing": null}, "nameservers": ["ns2.google.com", "ns1.google.com", "ns3.google.com", "ns4.google.com"], "expiration_date": ["2015-03-17T12:48:36"], "creation_date": ["2003-03-17T12:20:05"], "raw": ["Domain Name: google.cn\nROID: 20030311s10001s00033735-cn\nDomain Status: clientDeleteProhibited\nDomain Status: serverDeleteProhibited\nDomain Status: clientUpdateProhibited\nDomain Status: serverUpdateProhibited\nDomain Status: clientTransferProhibited\nDomain Status: serverTransferProhibited\nRegistrant ID: cnnic-zdmd-022\nRegistrant: Google Ireland Holdings\nRegistrant Contact Email: dns-admin@google.com\nSponsoring Registrar: MarkMonitor Inc.\nName Server: ns2.google.com\nName Server: ns1.google.com\nName Server: ns3.google.com\nName Server: ns4.google.com\nRegistration Date: 2003-03-17 12:20:05\nExpiration Date: 2015-03-17 12:48:36\nDNSSEC: unsigned\n\n"], "registrar": ["MarkMonitor Inc."]}

1
test/target_default/sina.com.cn
Unescape Escape View File

@ -0,0 +1 @@
{"status": ["clientDeleteProhibited", "serverDeleteProhibited", "clientUpdateProhibited", "serverUpdateProhibited", "clientTransferProhibited", "serverTransferProhibited"], "contacts": {"admin": null, "tech": null, "registrant": {"handle": "sinacomcn2", "name": "\u5317\u4eac\u65b0\u6d6a\u4e92\u8054\u4fe1\u606f\u670d\u52a1\u6709\u9650\u516c\u53f8", "email": "domainname@staff.sina.com.cn"}, "billing": null}, "nameservers": ["ns3.sina.com.cn", "ns2.sina.com.cn", "ns4.sina.com.cn", "ns1.sina.com.cn"], "expiration_date": ["2019-12-04T09:32:35"], "creation_date": ["1998-11-20T00:00:00"], "raw": ["Domain Name: sina.com.cn\nROID: 20021209s10011s00082127-cn\nDomain Status: clientDeleteProhibited\nDomain Status: serverDeleteProhibited\nDomain Status: clientUpdateProhibited\nDomain Status: serverUpdateProhibited\nDomain Status: clientTransferProhibited\nDomain Status: serverTransferProhibited\nRegistrant ID: sinacomcn2\nRegistrant: \u5317\u4eac\u65b0\u6d6a\u4e92\u8054\u4fe1\u606f\u670d\u52a1\u6709\u9650\u516c\u53f8\nRegistrant Contact Email: domainname@staff.sina.com.cn\nSponsoring Registrar: \u5317\u4eac\u65b0\u7f51\u6570\u7801\u4fe1\u606f\u6280\u672f\u6709\u9650\u516c\u53f8\nName Server: ns3.sina.com.cn\nName Server: ns2.sina.com.cn\nName Server: ns4.sina.com.cn\nName Server: ns1.sina.com.cn\nRegistration Date: 1998-11-20 00:00:00\nExpiration Date: 2019-12-04 09:32:35\nDNSSEC: unsigned\n\n"], "registrar": ["\u5317\u4eac\u65b0\u7f51\u6570\u7801\u4fe1\u606f\u6280\u672f\u6709\u9650\u516c\u53f8"]}

1
test/target_normalized/google.cn
Unescape Escape View File

@ -0,0 +1 @@
{"status": ["clientDeleteProhibited", "serverDeleteProhibited", "clientUpdateProhibited", "serverUpdateProhibited", "clientTransferProhibited", "serverTransferProhibited"], "contacts": {"admin": null, "tech": null, "registrant": {"handle": "cnnic-zdmd-022", "name": "Google Ireland Holdings", "email": "dns-admin@google.com"}, "billing": null}, "nameservers": ["ns2.google.com", "ns1.google.com", "ns3.google.com", "ns4.google.com"], "expiration_date": ["2015-03-17T12:48:36"], "creation_date": ["2003-03-17T12:20:05"], "raw": ["Domain Name: google.cn\nROID: 20030311s10001s00033735-cn\nDomain Status: clientDeleteProhibited\nDomain Status: serverDeleteProhibited\nDomain Status: clientUpdateProhibited\nDomain Status: serverUpdateProhibited\nDomain Status: clientTransferProhibited\nDomain Status: serverTransferProhibited\nRegistrant ID: cnnic-zdmd-022\nRegistrant: Google Ireland Holdings\nRegistrant Contact Email: dns-admin@google.com\nSponsoring Registrar: MarkMonitor Inc.\nName Server: ns2.google.com\nName Server: ns1.google.com\nName Server: ns3.google.com\nName Server: ns4.google.com\nRegistration Date: 2003-03-17 12:20:05\nExpiration Date: 2015-03-17 12:48:36\nDNSSEC: unsigned\n\n"], "registrar": ["MarkMonitor Inc."]}

1
test/target_normalized/sina.com.cn
Unescape Escape View File

@ -0,0 +1 @@
{"status": ["clientDeleteProhibited", "serverDeleteProhibited", "clientUpdateProhibited", "serverUpdateProhibited", "clientTransferProhibited", "serverTransferProhibited"], "contacts": {"admin": null, "tech": null, "registrant": {"handle": "sinacomcn2", "name": "\u5317\u4eac\u65b0\u6d6a\u4e92\u8054\u4fe1\u606f\u670d\u52a1\u6709\u9650\u516c\u53f8", "email": "domainname@staff.sina.com.cn"}, "billing": null}, "nameservers": ["ns3.sina.com.cn", "ns2.sina.com.cn", "ns4.sina.com.cn", "ns1.sina.com.cn"], "expiration_date": ["2019-12-04T09:32:35"], "creation_date": ["1998-11-20T00:00:00"], "raw": ["Domain Name: sina.com.cn\nROID: 20021209s10011s00082127-cn\nDomain Status: clientDeleteProhibited\nDomain Status: serverDeleteProhibited\nDomain Status: clientUpdateProhibited\nDomain Status: serverUpdateProhibited\nDomain Status: clientTransferProhibited\nDomain Status: serverTransferProhibited\nRegistrant ID: sinacomcn2\nRegistrant: \u5317\u4eac\u65b0\u6d6a\u4e92\u8054\u4fe1\u606f\u670d\u52a1\u6709\u9650\u516c\u53f8\nRegistrant Contact Email: domainname@staff.sina.com.cn\nSponsoring Registrar: \u5317\u4eac\u65b0\u7f51\u6570\u7801\u4fe1\u606f\u6280\u672f\u6709\u9650\u516c\u53f8\nName Server: ns3.sina.com.cn\nName Server: ns2.sina.com.cn\nName Server: ns4.sina.com.cn\nName Server: ns1.sina.com.cn\nRegistration Date: 1998-11-20 00:00:00\nExpiration Date: 2019-12-04 09:32:35\nDNSSEC: unsigned\n\n"], "registrar": ["\u5317\u4eac\u65b0\u7f51\u6570\u7801\u4fe1\u606f\u6280\u672f\u6709\u9650\u516c\u53f8"]}
Write Preview
Loading…
Cancel
Save