Merge branch 'gonzobot' into gonzobot+format-fixes

Author: linuxdaemon

plugins/whois.py

@@ -3,16 +3,25 @@
 Provides a command to allow users to look up information on domain names.
 """
 
+import sys
 from contextlib import suppress
 
 import pythonwhois
 
 from cloudbot import hook
 
+if sys.version_info < (3, 7, 0):
+    import pythonwhois
+else:
+    pythonwhois = None
+
 
 @hook.command
 def whois(text, reply):
-    """<domain> -- Does a whois query on <domain>."""
+    """<domain> - Does a whois query on <domain>."""
+    if pythonwhois is None:
+        return "The pythonwhois library does not work on this version of Python."
+
     domain = text.strip().lower()
 
     try:
@@ -25,13 +34,16 @@ def whois(text, reply):
 
     # We suppress errors here because different domains provide different data fields
     with suppress(KeyError):
-        info.append("\x02Registrar\x02: {}".format(data["registrar"][0]))
+        info.append(("Registrar", data["registrar"][0]))
 
     with suppress(KeyError):
-        info.append("\x02Registered\x02: {}".format(data["creation_date"][0].strftime("%d-%m-%Y")))
+        info.append(("Registered", data["creation_date"][0].strftime("%d-%m-%Y")))
 
     with suppress(KeyError):
-        info.append("\x02Expires\x02: {}".format(data["expiration_date"][0].strftime("%d-%m-%Y")))
+        info.append(("Expires", data["expiration_date"][0].strftime("%d-%m-%Y")))
+
+    if not info:
+        return "No information returned."
 
-    info_text = ", ".join(info)
+    info_text = ", ".join("\x02{name}\x02: {info}".format(name=name, info=i) for name, i in info)
     return "{} - {}".format(domain, info_text)