From 51a108d7d5f55cf1181c97cbe5e93731d9911d12 Mon Sep 17 00:00:00 2001 From: Larry Kim Date: Mon, 28 Jan 2013 03:00:32 +0900 Subject: [PATCH] Change directory structure --- src/tlds/ch | 0 src/tlds/com | 0 src/tlds/im | 0 src/tlds/in | 0 src/tlds/jp | 0 src/tlds/kr | 1 + src/tlds/net | 0 src/tlds/org | 0 src/tlds/so | 0 src/tlds/st | 0 src/whois.py | 20 ++++++++++++++------ 11 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 src/tlds/ch create mode 100644 src/tlds/com create mode 100644 src/tlds/im create mode 100644 src/tlds/in create mode 100644 src/tlds/jp create mode 100644 src/tlds/kr create mode 100644 src/tlds/net create mode 100644 src/tlds/org create mode 100644 src/tlds/so create mode 100644 src/tlds/st diff --git a/src/tlds/ch b/src/tlds/ch new file mode 100644 index 0000000..e69de29 diff --git a/src/tlds/com b/src/tlds/com new file mode 100644 index 0000000..e69de29 diff --git a/src/tlds/im b/src/tlds/im new file mode 100644 index 0000000..e69de29 diff --git a/src/tlds/in b/src/tlds/in new file mode 100644 index 0000000..e69de29 diff --git a/src/tlds/jp b/src/tlds/jp new file mode 100644 index 0000000..e69de29 diff --git a/src/tlds/kr b/src/tlds/kr new file mode 100644 index 0000000..81453d0 --- /dev/null +++ b/src/tlds/kr @@ -0,0 +1 @@ +server = "kr.whois-servers.net" diff --git a/src/tlds/net b/src/tlds/net new file mode 100644 index 0000000..e69de29 diff --git a/src/tlds/org b/src/tlds/org new file mode 100644 index 0000000..e69de29 diff --git a/src/tlds/so b/src/tlds/so new file mode 100644 index 0000000..e69de29 diff --git a/src/tlds/st b/src/tlds/st new file mode 100644 index 0000000..e69de29 diff --git a/src/whois.py b/src/whois.py index 20dd599..e184778 100644 --- a/src/whois.py +++ b/src/whois.py @@ -9,18 +9,26 @@ class Whois(object): self.domain = domain self.tld = self.domain.split(".")[-1] - self.whoisServers = {} - f = open(os.path.join(os.path.dirname(os.path.realpath(__file__)), "whois-servers.conf"), "r") - exec("self.whoisServers = %s"%(f.read())) + self.currPath = os.path.dirname(os.path.realpath(__file__)) + self.tldPath = os.path.join(self.currPath, "tlds") + self.tldList = os.listdir(self.tldPath) def chooseServer(self): - if self.whoisServers.has_key(self.tld): - return self.whoisServers[self.tld] + if self.tld in self.tldList: + settings = {} + execfile(os.path.join(self.tldPath, self.tld), {}, settings) + if "server" in settings: + return settings["server"] + else: + return self.tld + ".whois-servers.net" + else: - return self.tld + ".whois-servers.net" + return self.tld + ".whois-servers.net" + def run(self, redirect=True): s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.whoisServer = self.chooseServer() try: s.connect((self.whoisServer, 43)) except: