Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pythonwhois/parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,10 @@ def parse_raw_whois(raw_data, normalized=None, never_query_handles=True, handle_
# SIDN isn't very standard either. And EURid uses a similar format.
match = re.search("Registrar:\n\s+(?:Name:\s*)?(\S.*)", segment)
if match is not None:
data["registrar"].insert(0, match.group(1).strip())
try:
data["registrar"].insert(0, match.group(1).strip())
except KeyError as e:
data["registrar"] = match.group(1).strip()
match = re.search("(?:Domain nameservers|Name servers):([\s\S]*?\n)\n", segment)
if match is not None:
chunk = match.group(1)
Expand Down
44 changes: 44 additions & 0 deletions test/data/rogers.ca
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
Domain name: rogers.ca
Domain status: registered
Creation date: 2000/10/24
Expiry date: 2017/04/20
Updated date: 2012/12/27
DNSSEC: Unsigned

Registrar:
Name: CSC Corporate Domains (Canada) Company
Number: 2397937

Registrant:
Name: Rogers Communications Inc.

Administrative contact:
Name: Debra Charlery
Postal address: 333 Bloor St. East., 9th Floor
Toronto ON M4W 1G9 Canada
Phone: 1 416 9357938
Fax: 1 416 9357627
Email: [email protected]

Technical contact:
Name: Domain Tech
Postal address: RCI - Rogers Shared Services
8200 Dixie Road
Brampton ON L6T 0C1 Canada
Phone: 1 647 7475312
Fax:
Email: [email protected]

Name servers:
ns2.wlfdle.rnc.net.cable.rogers.com
ns2.ym.rnc.net.cable.rogers.com
ns3.wlfdle.rnc.net.cable.rogers.com
ns3.ym.rnc.net.cable.rogers.com

% WHOIS look-up made at 2015-09-29 22:12:10 (GMT)
%
% Use of CIRA's WHOIS service is governed by the Terms of Use in its Legal
% Notice, available at http://www.cira.ca/legal-notice/?lang=en
%
% (c) 2015 Canadian Internet Registration Authority, (http://www.cira.ca/)

1 change: 1 addition & 0 deletions test/target_default/rogers.ca
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"status": ["registered"], "updated_date": ["2012-12-27T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "nameservers": ["ns2.wlfdle.rnc.net.cable.rogers.com", "ns2.ym.rnc.net.cable.rogers.com", "ns3.wlfdle.rnc.net.cable.rogers.com", "ns3.ym.rnc.net.cable.rogers.com"], "expiration_date": ["2017-04-20T00:00:00"], "creation_date": ["2000-10-24T00:00:00"], "raw": ["Domain name: rogers.ca\nDomain status: registered\nCreation date: 2000/10/24\nExpiry date: 2017/04/20\nUpdated date: 2012/12/27\nDNSSEC: Unsigned\n\nRegistrar:\n Name: CSC Corporate Domains (Canada) Company\n Number: 2397937\n\nRegistrant:\n Name: Rogers Communications Inc.\n\nAdministrative contact:\n Name: Debra Charlery\n Postal address: 333 Bloor St. East., 9th Floor \n Toronto ON M4W 1G9 Canada\n Phone: 1 416 9357938\n Fax: 1 416 9357627\n Email: [email protected]\n\nTechnical contact:\n Name: Domain Tech\n Postal address: RCI - Rogers Shared Services\n 8200 Dixie Road \n Brampton ON L6T 0C1 Canada\n Phone: 1 647 7475312\n Fax:\n Email: [email protected]\n\nName servers:\n ns2.wlfdle.rnc.net.cable.rogers.com\n ns2.ym.rnc.net.cable.rogers.com\n ns3.wlfdle.rnc.net.cable.rogers.com\n ns3.ym.rnc.net.cable.rogers.com\n\n% WHOIS look-up made at 2015-09-29 22:12:10 (GMT)\n%\n% Use of CIRA's WHOIS service is governed by the Terms of Use in its Legal\n% Notice, available at http://www.cira.ca/legal-notice/?lang=en \n%\n% (c) 2015 Canadian Internet Registration Authority, (http://www.cira.ca/) \n\n"], "registrar": ["C", "S", " ", "o", "r", "p", "a", "t", "e", "D", "m", "i", "n", "s", "(", "d", ")", "y"], "emails": ["[email protected]", "[email protected]"]}
1 change: 1 addition & 0 deletions test/target_normalized/rogers.ca
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"status": ["Registered"], "updated_date": ["2012-12-27T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "nameservers": ["ns2.wlfdle.rnc.net.cable.rogers.com", "ns2.ym.rnc.net.cable.rogers.com", "ns3.wlfdle.rnc.net.cable.rogers.com", "ns3.ym.rnc.net.cable.rogers.com"], "expiration_date": ["2017-04-20T00:00:00"], "creation_date": ["2000-10-24T00:00:00"], "raw": ["Domain name: rogers.ca\nDomain status: registered\nCreation date: 2000/10/24\nExpiry date: 2017/04/20\nUpdated date: 2012/12/27\nDNSSEC: Unsigned\n\nRegistrar:\n Name: CSC Corporate Domains (Canada) Company\n Number: 2397937\n\nRegistrant:\n Name: Rogers Communications Inc.\n\nAdministrative contact:\n Name: Debra Charlery\n Postal address: 333 Bloor St. East., 9th Floor \n Toronto ON M4W 1G9 Canada\n Phone: 1 416 9357938\n Fax: 1 416 9357627\n Email: [email protected]\n\nTechnical contact:\n Name: Domain Tech\n Postal address: RCI - Rogers Shared Services\n 8200 Dixie Road \n Brampton ON L6T 0C1 Canada\n Phone: 1 647 7475312\n Fax:\n Email: [email protected]\n\nName servers:\n ns2.wlfdle.rnc.net.cable.rogers.com\n ns2.ym.rnc.net.cable.rogers.com\n ns3.wlfdle.rnc.net.cable.rogers.com\n ns3.ym.rnc.net.cable.rogers.com\n\n% WHOIS look-up made at 2015-09-29 22:12:10 (GMT)\n%\n% Use of CIRA's WHOIS service is governed by the Terms of Use in its Legal\n% Notice, available at http://www.cira.ca/legal-notice/?lang=en \n%\n% (c) 2015 Canadian Internet Registration Authority, (http://www.cira.ca/) \n\n"], "registrar": ["C", "S", " ", "o", "r", "p", "a", "t", "e", "D", "m", "i", "n", "s", "(", "d", ")", "y"], "emails": ["[email protected]", "[email protected]"]}