Update expected outputs and refactor exceptions for improved error ha…

…ndling

README.md

@@ -1,15 +1,12 @@
-Goal
-====
+# Goal
 
--  Create a simple importable Python module which will produce parsed
-   WHOIS data for a given domain.
--  Able to extract data for all the popular TLDs (com, org, net, ...)
--  Query a WHOIS server directly instead of going through an
-   intermediate web service like many others do.
+- Create a simple importable Python module which will produce parsed
+  WHOIS data for a given domain.
+- Able to extract data for all the popular TLDs (com, org, net, ...)
+- Query a WHOIS server directly instead of going through an
+  intermediate web service like many others do.
 
-
-Example
-=======
+# Example
 
 ```python
 >>> import whois
@@ -21,7 +18,7 @@ u'\nDomain Name: EXAMPLE.COM
 Registry Domain ID: 2336799_DOMAIN_COM-VRSN
 ...'
 
->>> print(w)  # print values of all found attributes    
+>>> print(w)  # print values of all found attributes
 {
   "creation_date": "1995-08-14 04:00:00",
   "expiration_date": "2022-08-13 04:00:00",
@@ -34,8 +31,7 @@ Registry Domain ID: 2336799_DOMAIN_COM-VRSN
   ...
 ```
 
-Install
-=======
+# Install
 
 Install from pypi:
 
@@ -56,12 +52,11 @@ Run test cases:
 python -m pytest
 ```
 
-Problems?
-=========
+# Problems?
 
-Pull requests are welcome! 
+Pull requests are welcome!
 
-Thanks to the many who have sent patches for additional TLDs. If you want to add or fix a TLD it's quite straightforward. 
+Thanks to the many who have sent patches for additional TLDs. If you want to add or fix a TLD it's quite straightforward.
 See example domains in [whois/parser.py](https://github.com/richardpenman/whois/blob/master/whois/parser.py)
 
 Basically each TLD has a similar format to the following:
@@ -79,7 +74,7 @@ class WhoisOrg(WhoisEntry):
 
   def __init__(self, domain, text):
     if text.strip() == 'NOT FOUND':
-      raise PywhoisError(text)
+      raise WhoisDomainNotFoundError(text)
     else:
       WhoisEntry.__init__(self, domain, text)
 ```

test/samples/expected/abv.bg

@@ -1 +1 @@
-{"domain_name": "abv.bg", "expiration_date": "see at www.register.bg", "updated_date": null, "registrar": null, "registrar_url": null, "creation_date": null, "status": "Registered"}
+{"domain_name": "abv.bg", "expiration_date": null, "updated_date": null, "registrar": null, "registrar_url": null, "creation_date": null, "status": "Registered"}

test/samples/expected/google.cl

@@ -1 +1 @@
-{"domain_name": "google.cl", "expiration_date": "2019-11-20 14:48:02 CLST", "updated_date": null, "registrar": "MarkMonitor Inc.", "registrar_url": "https://markmonitor.com/", "creation_date": "2002-10-22 17:48:23 CLST", "status": null}
+{"domain_name": "google.cl", "expiration_date": "2019-11-20 14:48:02", "updated_date": null, "registrar": "MarkMonitor Inc.", "registrar_url": "https://markmonitor.com/", "creation_date": "2002-10-22 17:48:23", "status": null}

test/samples/expected/google.com.ua

@@ -1 +1 @@
-{"domain_name": "google.com.ua", "expiration_date": "2019-12-04 00:00:00+02", "updated_date": "2018-11-02 11:29:08+02", "registrar": "MarkMonitor Inc.", "registrar_url": "http://markmonitor.com", "creation_date": ["2002-12-04 00:00:00+02", "2017-07-28 23:53:31+03"], "status": ["clientDeleteProhibited", "clientTransferProhibited", "clientUpdateProhibited", "ok", "linked"]}
+{"domain_name": "google.com.ua", "expiration_date": "2019-12-04 00:00:00+02:00", "updated_date": "2018-11-02 11:29:08+02:00", "registrar": "MarkMonitor Inc.", "registrar_url": "http://markmonitor.com", "creation_date": ["2002-12-04 00:00:00+02:00", "2017-07-28 23:53:31+03:00"], "status": ["clientDeleteProhibited", "clientTransferProhibited", "clientUpdateProhibited", "ok", "linked"]}

whois/__init__.py

@@ -7,7 +7,9 @@
 import subprocess
 import sys
 from typing import Any, Optional, Pattern
-from .parser import WhoisEntry, PywhoisError
+
+from .exceptions import WhoisError
+from .parser import WhoisEntry
 from .whois import NICClient
 
 
@@ -65,7 +67,7 @@ def whois(
                 whois_command.append(executable_opts)
         r = subprocess.Popen(whois_command, stdout=subprocess.PIPE)
         if r.stdout is None:
-            raise PywhoisError("Whois command returned no output")
+            raise WhoisError("Whois command returned no output")
         else:
             text = r.stdout.read().decode()
     else:

whois/exceptions.py

@@ -1,26 +1,30 @@
 class PywhoisError(Exception):
     pass
 
+#backwards compatibility
+class WhoisError(PywhoisError):
+    pass
+
 
-class UnknownTldError(PywhoisError):
+class UnknownTldError(WhoisError):
     pass
 
 
-class WhoisDomainNotFoundError(PywhoisError):
+class WhoisDomainNotFoundError(WhoisError):
     pass
 
 
-class FailedParsingWhoisOutputError(PywhoisError):
+class FailedParsingWhoisOutputError(WhoisError):
     pass
 
 
-class WhoisQuotaExceededError(PywhoisError):
+class WhoisQuotaExceededError(WhoisError):
     pass
 
 
-class UnknownDateFormatError(PywhoisError):
+class WhoisUnknownDateFormatError(WhoisError):
     pass
 
 
-class WhoisCommandFailedError(PywhoisError):
+class WhoisCommandFailedError(WhoisError):
     pass