From 07bf8f51387ebc50a59b167544cadba920f60d92 Mon Sep 17 00:00:00 2001
From: Larry Kim <admin@relip.org>
Date: Sun, 10 Feb 2013 23:16:14 +0900
Subject: [PATCH] Replace CRLF with LF, fix bugs, .im support

---
 whois/tlds/im  |  8 +++++++-
 whois/tlds/net | 13 ++++++-------
 whois/whois.py |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/whois/tlds/im b/whois/tlds/im
index 4d43f7e..a2e486d 100644
--- a/whois/tlds/im
+++ b/whois/tlds/im
@@ -1,8 +1,14 @@
-
 parse = {
 	"default": {
+		"NotFound": "was not found.",
 		"DomainName": "Domain Name:\s+(.+)",
+		"RegistrantName": "Domain Owners \/ Registrant\nName:\s+(.+)",
+		"RegistrantAddress": "Domain Owners \/ Registrant\nName: .+\nAddress\n([\S\s]*)\nAdministrative",
 		"ExpirationDate": "Expiry Date: (.+)",
 		"Registrar": "Domain Managers\nName: (.+)",
+		"RegistrarAddress": "Domain Managers\nName: .+\nAddress\n([\S\s]*)\nDomain Owners",
+		"AdminName": "Administrative Contact\nName:\s+(.+)",
+		"AdminAddress": "Administrative Contact\nName:.+\nAddress\n([\S\s]*)\nBilling Contact",
+		"NameServer": "Name Server:\s+(.+)[.]",
 	}
 }
diff --git a/whois/tlds/net b/whois/tlds/net
index f3a8bea..633e2ab 100644
--- a/whois/tlds/net
+++ b/whois/tlds/net
@@ -4,12 +4,11 @@ server = {
 }
 
 parse = {
-	"regex": {
-		"default": {
+	"default": {
 			
-		},
-		"whois.dotname.co.kr":
-		{
-		},
-	}
+	},
+	"whois.dotname.co.kr":
+	{
+
+	},
 }
diff --git a/whois/whois.py b/whois/whois.py
index c66c169..9bc9ef0 100644
--- a/whois/whois.py
+++ b/whois/whois.py
@@ -59,7 +59,7 @@ class Whois(object):
 
 			result += buffer
 
-		return result 
+		return result.replace("\r\n", "\n")
 
 	def query(self, redirect=True):
 		whoisServer = self.chooseServer()