From 162cad882fc1e17fd6ecddf88250629e58c8f81c Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Fri, 21 Sep 2012 07:33:47 +0200 Subject: [PATCH] Fix Tucows whois parsing --- pythonwhois/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pythonwhois/__init__.py b/pythonwhois/__init__.py index 40ac193..7369d45 100644 --- a/pythonwhois/__init__.py +++ b/pythonwhois/__init__.py @@ -52,6 +52,7 @@ grammar = { 'Registrar Name:\s?(?P.+)', 'Record maintained by:\s?(?P.+)', 'Registration Service Provided By:\s?(?P.+)', + 'Registrar of Record:\s?(?P.+)', '\tName:\t\s(?P.+)'], 'whois_server': ['Registrar Whois:\s?(?P.+)'], 'name_servers': ['(?P[a-z]*d?ns[0-9]+([a-z]{3})?\.([a-z0-9-]+\.)+[a-z0-9]+)', @@ -59,7 +60,7 @@ grammar = { '(?P([a-z0-9-]+\.)+[a-z0-9]+)(\s+([0-9]{1,3}\.){3}[0-9]{1,3})', 'DNS[0-9]+:\s*(?P.+)', 'ns[0-9]+:\s*(?P.+)', - '[^a-z0-9-](?Pdns\.([a-z0-9-]+\.)+[a-z0-9]+)'], + '[^a-z0-9-](?Pd?ns\.([a-z0-9-]+\.)+[a-z0-9]+)'], 'emails': ['(?P[\w.-]+@[\w.-]+\.[\w]{2,4})'] }, "_dateformats": (