diff --git a/pythonwhois/__init__.py b/pythonwhois/__init__.py index 7369d45..fd90e70 100644 --- a/pythonwhois/__init__.py +++ b/pythonwhois/__init__.py @@ -24,6 +24,7 @@ grammar = { 'Record created on\s?[.]*:?\s*?(?P.+)', 'Record created\s?[.]*:?\s*?(?P.+)', 'Created\s?[.]*:?\s*?(?P.+)', + 'Registered on\s?[.]*:?\s*?(?P.+)', 'Domain Registration Date\s?[.]*:?\s*?(?P.+)'], 'expiration_date': ['Expires on:\s?(?P.+)', 'Expires on\s?[.]*:\s?(?P.+)\.', @@ -60,8 +61,9 @@ 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-](?Pd?ns\.([a-z0-9-]+\.)+[a-z0-9]+)'], - 'emails': ['(?P[\w.-]+@[\w.-]+\.[\w]{2,4})'] + '[^a-z0-9.-](?Pd?ns\.([a-z0-9-]+\.)+[a-z0-9]+)'], + 'emails': ['(?P[\w.-]+@[\w.-]+\.[\w]{2,4})', + '(?P[\w.-]+\sAT\s[\w.-]+\sDOT\s[\w]{2,4})'] }, "_dateformats": ( '(?P[0-9]{1,2})[./ -](?PJan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[./ -](?P[0-9]{4}|[0-9]{2})'