Merge pull request #243 from FabrizioPeresson/master

Fix for Windows, list of test with 'None' result, server for AI TLD

Author: MooCow

test.py

@@ -15,6 +15,7 @@
     # OK NOW:
     # abroco.me
     # wp.pl
+    # google.ai
 
     # New TLD
     whois.aero
@@ -353,7 +354,7 @@
 """
 
 failure = {}
-
+nones = []
 
 def prepItem(d):
     print("-" * 80)
@@ -367,6 +368,7 @@ def testItem(d):
         for k, v in wd.items():
             print('%20s\t"%s"' % (k, v))
     else:
+        nones.append(d)
         print("None")
 
 
@@ -451,11 +453,14 @@ def main():
         print("\n========================================\n")
         testDomains(UnknownDateFormat.split("\n"))
 
-        print(f"Failure during test : {len(failure)}")
-
     print("\n# ========================")
+    print(f"Failure during test : {len(failure)}")
     for i in sorted(failure.keys()):
         print(i, failure[i])
 
+    print("\n# ========================")
+    print(f"Domains with 'None' result : {len(nones)}")
+    for d in sorted(nones):
+        print(d)
 
 main()

whois/_1_query.py

@@ -104,9 +104,25 @@ def makeWhoisCommandToRun(
 
     if platform.system() == "Windows":
         # Usage: whois [-v] domainname [whois.server]
-        if not os.path.exists("whois.exe"):
-            tryInstallMissingWhoisOnWindows(verbose)
-        wh = r".\whois.exe "
+
+        if os.path.exists("whois.exe"):
+            wh = r".\whois.exe "
+        else:
+            find = False
+            paths = os.environ["path"].split(";")
+            for path in paths:
+                wpath = os.path.join(path, "whois.exe")
+                if os.path.exists(wpath):
+                    wh = wpath
+                    find = True
+                    break
+
+            if not find:
+                tryInstallMissingWhoisOnWindows(verbose)
+
+        if server:
+            return [wh, "-v", "-nobanner", domain, server]
+        return [wh, "-v", "-nobanner", domain]
 
     if server:
         return [wh, domain, "-h", server]

whois/_2_parse.py

@@ -103,7 +103,7 @@ def cleanupWhoisResponse(
         if line.startswith("Terms of Use:"):  # these lines contibute nothing so ignore
             continue
 
-        tmp2.append(line)
+        tmp2.append(line.strip("\r"))
 
     return "\n".join(tmp2)
 

whois/tld_regexpr.py

@@ -63,6 +63,7 @@
 # Anguilla
 ai = {
     "extend": "com",
+    "_server": "whois.nic.ai",
 }
 
 # Armenia