Merge pull request #334 from kazet/fixing-pl-whois

For pl registry, if 'option expiration date' is not present, 'renewaldate' should be treated as the expiry date

Author: maarten-boot

whois/tldDb/tld_regexpr.py

@@ -735,7 +735,9 @@ def xStr(what: str, times: int = 1, firstMandatory: bool = True) -> str:
     "registrar": R(r"\nREGISTRAR:\s*(.+)\n"),
     "creation_date": R(r"\ncreated:\s*(.+)\n"),
     "updated_date": R(r"\nlast modified:\s*(.+)\n"),
-    "expiration_date": R(r"\noption expiration date:\s*(.+)\n"),
+    # If no "option expiration date:" is present, use "renewal date:", but only
+    # if it's not not followed by "option expiration date:".
+    "expiration_date": R(r"(?:\noption expiration date:|renewal date:(?!(?:.|\n)*\noption expiration date:))\s*(.+)\n"),
     "name_servers": R(r"nameservers:%s" % xStr(r"(?:\s+(\S+)[^\n]*\n)?", 4)),
     "status": R(r"\nStatus:\n\s*(.+)"),
 }