Merge branch 'master' into master

.gitignore

@@ -55,3 +55,5 @@ docs/_build/
 
 # PyBuilder
 target/
+
+.idea

setup.py

@@ -2,7 +2,7 @@
 
 setup(
 	name='whois',
-	version='0.6.5',
+	version='0.7.1',
 	description='Python module/library for retrieving WHOIS information of domains.',
 	long_description = open('README').read(),
 	author='DDarko.org',

whois/_1_query.py

@@ -58,7 +58,7 @@ def _do_whois_query(dl, ignore_returncode):
 	p = subprocess.Popen(['whois', '.'.join(dl)], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 	r = p.communicate()[0]
 	r = r.decode() if PYTHON_VERSION == 3 else r
-	if not ignore_returncode and p.returncode != 0: raise Exception(r)
+	if not ignore_returncode and p.returncode != 0 and p.returncode != 1: raise Exception(r)
 	return r
 
 

whois/_3_adjust.py

@@ -54,6 +54,7 @@ def __init__(self, data):
 	'%a %b %d %Y',					# Tue Dec 12 2000
 	'%Y-%m-%dT%H:%M:%S',			# 2007-01-26T19:10:31
 	'%Y-%m-%dT%H:%M:%SZ',			# 2007-01-26T19:10:31Z
+	'%Y-%m-%dt%H:%M:%S.%fz',		# 2007-01-26t19:10:31.00z
 	'%Y-%m-%dT%H:%M:%S%z',			# 2011-03-30T19:36:27+0200
 	'%Y-%m-%dT%H:%M:%S.%f%z',		# 2011-09-08T14:44:51.622265+03:00
 	'%Y-%m-%dt%H:%M:%S.%f',			# 2011-09-08t14:44:51.622265

whois/tld_regexpr.py

@@ -247,6 +247,21 @@
 'status':					r'status:\s?(.+)',
 }
 
+ca = {
+'extend': 'com',
+
+'domain_name':				r'domain:\s?(.+)',
+'registrar':				r'registrar:\s*(.+)',
+'registrant':				r'contact:\s?(.+)',
+
+'creation_date':			r'created:\s?(.+)',
+'expiration_date':			None,
+'updated_date':				r'last-update:\s?(.+)',
+
+'name_servers':				r'nserver:\s*(.+)',
+'status':					r'status:\s?(.+)',
+}
+
 br = {
     'extend': 'com',
     'domain_name':              r'domain:\s?(.+)',
@@ -260,6 +275,7 @@
     'status':                   r'status:\s?(.+)',
 }
 
+
 mx = {
 'domain_name':              r'Domain Name:\s?(.+)',
 'registrant':               r'Registrant:\n\s*(.+)',
@@ -268,4 +284,12 @@
 'expiration_date':          r'Expiration Date:\s?(.+)',
 'updated_date':             r'Last Updated On:\s?(.+)',
 'name_servers':             r'\sDNS:\s*(.+)',
-}
+}
+
+sh = {
+    'extend': 'com',
+    'expiration_date':         r'\nRegistry Expiry Date:\s*(.+)',
+    'registrant':              r'\nRegistrant Organization:\s?(.+)',
+    'status':                  r'\nDomain Status:\s?(.+)',
+}
+