From 88a1784e90b9c99690a59ed1e0d9301001c5c260 Mon Sep 17 00:00:00 2001
From: Sven Slootweg <jamsoftgamedev@gmail.com>
Date: Fri, 21 Sep 2012 17:06:31 +0200
Subject: [PATCH] Support anti-spam formatted e-mail addresses and Nominet
 (.uk) registration date

---
 pythonwhois/__init__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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<val>.+)',
 					 'Record created\s?[.]*:?\s*?(?P<val>.+)',
 					 'Created\s?[.]*:?\s*?(?P<val>.+)',
+					 'Registered on\s?[.]*:?\s*?(?P<val>.+)',
 					 'Domain Registration Date\s?[.]*:?\s*?(?P<val>.+)'],
 		'expiration_date':	['Expires on:\s?(?P<val>.+)',
 					 'Expires on\s?[.]*:\s?(?P<val>.+)\.',
@@ -60,8 +61,9 @@ grammar = {
 					 '(?P<val>([a-z0-9-]+\.)+[a-z0-9]+)(\s+([0-9]{1,3}\.){3}[0-9]{1,3})',
 					 'DNS[0-9]+:\s*(?P<val>.+)',
 					 'ns[0-9]+:\s*(?P<val>.+)',
-					 '[^a-z0-9-](?P<val>d?ns\.([a-z0-9-]+\.)+[a-z0-9]+)'],
-		'emails':		['(?P<val>[\w.-]+@[\w.-]+\.[\w]{2,4})']
+					 '[^a-z0-9.-](?P<val>d?ns\.([a-z0-9-]+\.)+[a-z0-9]+)'],
+		'emails':		['(?P<val>[\w.-]+@[\w.-]+\.[\w]{2,4})',
+					 '(?P<val>[\w.-]+\sAT\s[\w.-]+\sDOT\s[\w]{2,4})']
 	},
 	"_dateformats": (
 		'(?P<day>[0-9]{1,2})[./ -](?P<month>Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[./ -](?P<year>[0-9]{4}|[0-9]{2})'