From ae1e7692722e1839a17cff89acc506309e33725a Mon Sep 17 00:00:00 2001
From: Larry Kim <admin@relip.org>
Date: Fri, 22 Feb 2013 15:09:44 +0900
Subject: [PATCH] Add 'format' setting, so that users can set data format for
 each whois server. .com support. Bug fix.

---
 whois/parser.py |  3 ++-
 whois/tlds/com  | 13 +++++++++++++
 whois/whois.py  |  6 +++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/whois/parser.py b/whois/parser.py
index c59a481..f0721ea 100644
--- a/whois/parser.py
+++ b/whois/parser.py
@@ -123,6 +123,7 @@ class Parser(object):
 				logging.debug("run: regex matches found for key %s. %s"%(key, matches))
 				result.update({key: map(lambda x: x.strip(), matches)})
 
-			logging.debug("run: No match for %s"%(key))
+			else:
+				logging.debug("run: No match for %s"%(key))
 
 		print result
diff --git a/whois/tlds/com b/whois/tlds/com
index e69de29..15abfb1 100644
--- a/whois/tlds/com
+++ b/whois/tlds/com
@@ -0,0 +1,13 @@
+server = {
+	"redirect": "\s+Whois Server: (.*)",
+	"format": {
+		"com.whois-servers.net": "domain %DOMAIN%",
+		"whois.verisign-grs.com": "domain %DOMAIN%",
+	},
+}
+
+parse = {
+	"default": {
+		"LoadConf": "net/default",
+	},
+}
diff --git a/whois/whois.py b/whois/whois.py
index 35f1917..d1db049 100644
--- a/whois/whois.py
+++ b/whois/whois.py
@@ -64,7 +64,11 @@ class Whois(object):
 			logging.error("sendQuery: Error connecting to whois server %s"%(whoisServer))
 			return False 
 
-		msg = self.domain + "\r\n"
+		try:
+			msg = self.settings['format'][whoisServer].replace("%DOMAIN%", self.domain) + "\r\n"
+
+		except:
+			msg = self.domain + "\r\n"
 
 		logging.debug("sendQuery: Sending data.. %s"%(msg))