diff -r f1e5214a1b16 -r 7801a420f679 whois/__init__.py --- a/whois/__init__.py Tue Sep 01 12:06:17 2015 +0800 +++ b/whois/__init__.py Sat Sep 05 23:01:44 2015 +0800 @@ -7,23 +7,19 @@ from whois import NICClient -def whois(url, experimental=False): +def whois(url, command=False): # clean domain to expose netloc ip_match = re.match(r"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$", url) if ip_match: domain = url else: domain = extract_domain(url) - if not experimental: - try: - # try native whois command first - r = subprocess.Popen(['whois', domain], stdout=subprocess.PIPE) - text = r.stdout.read() - except OSError: - # try experimental client - nic_client = NICClient() - text = nic_client.whois_lookup(None, domain, 0) + if command: + # try native whois command + r = subprocess.Popen(['whois', domain], stdout=subprocess.PIPE) + text = r.stdout.read() else: + # try builtin client nic_client = NICClient() text = nic_client.whois_lookup(None, domain, 0) return WhoisEntry.load(domain, text) @@ -34,10 +30,8 @@ >>> extract_domain('http://www.google.com.au/tos.html') 'google.com.au' - >>> extract_domain('http://blog.webscraping.com') + >>> extract_domain('www.webscraping.com') 'webscraping.com' - >>> extract_domain('www.bbc.co.uk') - 'bbc.co.uk' >>> extract_domain('198.252.206.140') 'stackoverflow.com' >>> extract_domain('102.112.2O7.net') @@ -73,6 +67,6 @@ try: url = sys.argv[1] except IndexError: - print('Usage: %s url' % sys.argv[0]) + print 'Usage: %s url' % sys.argv[0] else: - print(whois(url)) + print whois(url)