Merge pull request #4 from gusingh-r7/whois

Bug fix for empty Expiration Date
rapid7 · Nov 13, 2019 · 4ace5e6 · 4ace5e6
2 parents 228d824 + ac14e5e
commit 4ace5e6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='python-whois-extended',
-    version='0.6.10',
+    version='0.6.11',
     description='Python module/library for retrieving WHOIS information of domains. Able to extract data for all the popular TLDs (com, net, org, uk, pl, ru, lv, jp, co_jp, de, at, eu, biz, info, name, us, co, me, be, nz, cz, it, fr, kg, vc, fm, tv, edu, ca)',
     long_description=open('README').read(),
     author='Andrew Minkin and DDarko.org',

diff --git a/test.py b/test.py
@@ -26,6 +26,7 @@
 google.cz
 google.fr
 google.lv
+gotechnology.io
 e2e4.online,whois.nic.ru
 napaster.name,whois.nic.ru
 XN--C1AAY4A.XN--P1AI

diff --git a/whois/tld_regexpr.py b/whois/tld_regexpr.py
@@ -7,7 +7,7 @@
     'registrant_cc': r'Registrant:?\s{0,}(?:[^\n][\n]?){0,}?\s{0,}Country(?:[^:]{0,}):\s?(.+)',
 
     'creation_date': r'Creation Date:\s?(.+)',
-    'expiration_date': r'Expiration Date:\s?(.+)',
+    'expiration_date': r'Expiration Date:\n|Expiration Date:\s?(.+)',
     'updated_date': r'Updated Date:\s?(.+)',
 
     'name_servers': r'Name Server:\s*(.+)\s*',