From bb33a423bcdd365223ad93a56c9c3bf4f8d9c537 Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Sat, 22 Sep 2012 22:05:07 +0200 Subject: [PATCH] Include raw WHOIS output --- pythonwhois/__init__.py | 2 +- setup.py | 2 +- test.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pythonwhois/__init__.py b/pythonwhois/__init__.py index 8ca49c9..d6563bb 100644 --- a/pythonwhois/__init__.py +++ b/pythonwhois/__init__.py @@ -206,7 +206,7 @@ def whois(domain): if data['registrar'] is not None: data['registrar'] = remove_duplicates(data['registrar']) - return data + return out, data def parse_dates(dates): global grammar diff --git a/setup.py b/setup.py index 02b4270..a91923d 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup setup(name='pythonwhois', - version='1.1.0', + version='1.2.0', description='Module for retrieving and parsing the WHOIS data for a domain. Supports most domains. Requires jwhois to be installed.', author='Sven Slootweg', author_email='pythonwhois@cryto.net', diff --git a/test.py b/test.py index 8a41a47..1640167 100644 --- a/test.py +++ b/test.py @@ -10,7 +10,8 @@ testlist = open("testlist.txt").readlines() # print "WHOIS for %s does not contain an update date?" % line #result = pythonwhois.whois("google.com") -result = pythonwhois.whois(sys.argv[1]) +raw, result = pythonwhois.whois(sys.argv[1]) +print raw print result #print "Creation date: ",