Merge pull request #209 from maarten-boot/master

add tld ga; optional cleaning raw whois output; update readme

README.md

@@ -10,6 +10,9 @@ A Python package for retrieving WHOIS information of domains.
  * All dates as datetime objects.
  * Possibility to cache results.
  * Verbose output on stderr during debugging to see how the internal functions are doing their work
+ * raise a exception on Quota ecceeded type responses
+ * raise a exception on PrivateRegistry tld's where we know the tld and know we don't know anything
+ * allow for optional cleaning the whois response before extracting information
 
 ## Help Wanted
 Your contributions are welcome, look for the Help wanted tag https://github.com/DannyCork/python-whois/labels/help%20wanted

test.py

@@ -314,7 +314,7 @@ def testDomains(aList):
 
 def main():
 
-    testOnlyProblems = True
+    testOnlyProblems = False
 
     if testOnlyProblems is False:
         print("Tld's currently supported")

whois/_2_parse.py

@@ -61,8 +61,8 @@ def get_tld_re(tld: str) -> Any:
 def cleanupWhoisResponse(
     response: str,
     verbose: bool = False,
+    with_cleanup_results: bool = False,
 ) -> str:
-    # sometimes the quota exceeded is actually in the % lines (e.g. toplevel .at)
 
     if 0:
         if verbose:
@@ -72,12 +72,16 @@ def cleanupWhoisResponse(
 
     tmp2 = []
     for line in tmp:
-        # cleanup comment lines commonly used by whois
-        if line.startswith("%"):
+        if with_cleanup_results is True and line.startswith("%"):
+            # sometimes the quota exceeded is actually in the % lines (e.g. toplevel .at)
             continue
+
         if "REDACTED FOR PRIVACY" in line:
             continue
 
+        if line.startswith("Terms of Use:"):
+            continue
+
         tmp2.append(line)
 
     response = "\n".join(tmp2)
@@ -97,11 +101,11 @@ def do_parse(
 ) -> Optional[Dict[str, Any]]:
     r: Dict[str, Any] = {"tld": tld}
 
-    if with_cleanup_results is True:
-        whois_str = cleanupWhoisResponse(
-            response=whois_str,
-            verbose=verbose,
-        )
+    whois_str = cleanupWhoisResponse(
+        response=whois_str,
+        verbose=verbose,
+        with_cleanup_results=with_cleanup_results,
+    )
 
     if whois_str.count("\n") < 5:
         if verbose:

whois/__init__.py

@@ -46,6 +46,9 @@
 Map2Underscore = {
     ".ac.uk": "ac_uk",
     ".co.il": "co_il",
+    # uganda
+    ".ca.ug": "ca_ug",
+    ".co.ug": "co_ug",
     # th
     ".co.th": "co_th",
     ".in.th": "in_th",
@@ -63,7 +66,10 @@
     #
     ".com.au": "com_au",
     ".com.sg": "com_sg",
+    #
     ".com.tr": "com_tr",
+    ".edu.tr": "edu_tr",
+    #
     ".edu.ua": "edu_ua",
     # dynamic dns without whois
     ".hopto.org": "hopto_org",

whois/tld_regexpr.py

@@ -1577,10 +1577,7 @@
 # (https://www.iana.org/domains/root/db/<tld>.html)
 
 # ba
-# duckdns.org
 # es
-# ga
-# li
 # pk
 # com.pk
 # edu.pk
@@ -1595,6 +1592,7 @@
 li = {"extend": "_privateReg"}
 tk = {"extend": "_privateReg"}
 vn = {"extend": "_privateReg"}
+ga = {"extend": "_privateReg"}
 
 hopto_org = {"extend": "_privateReg"}  # dynamic dns without any whois
 duckdns_org = {"extend": "_privateReg"}  # dynamic dns without any whois