geopy.exc: extend more specific built-in exceptions where appropriate (…

…#484)

geopy/exc.py

@@ -9,7 +9,7 @@ class GeopyError(Exception):
     """
 
 
-class ConfigurationError(GeopyError):
+class ConfigurationError(GeopyError, ValueError):
     """
     When instantiating a geocoder, the arguments given were invalid. See
     the documentation of each geocoder's ``__init__`` for more details.
@@ -27,7 +27,7 @@ class GeocoderServiceError(GeopyError):
     """
 
 
-class GeocoderQueryError(GeocoderServiceError):
+class GeocoderQueryError(GeocoderServiceError, ValueError):
     """
     Either geopy detected input that would cause a request to fail,
     or a request was made and the remote geocoding service responded
@@ -42,7 +42,7 @@ class GeocoderQuotaExceeded(GeocoderServiceError):
     """
 
 
-class GeocoderRateLimited(GeocoderQuotaExceeded):
+class GeocoderRateLimited(GeocoderQuotaExceeded, IOError):
     """
     The remote geocoding service has rate-limited the request.
     Retrying later might help.
@@ -74,7 +74,7 @@ class GeocoderInsufficientPrivileges(GeocoderServiceError):
     """
 
 
-class GeocoderTimedOut(GeocoderServiceError):
+class GeocoderTimedOut(GeocoderServiceError, TimeoutError):
     """
     The call to the geocoding service was aborted because no response
     has been received within the ``timeout`` argument of either
@@ -84,7 +84,7 @@ class GeocoderTimedOut(GeocoderServiceError):
     """
 
 
-class GeocoderUnavailable(GeocoderServiceError):
+class GeocoderUnavailable(GeocoderServiceError, IOError):
     """
     Either it was not possible to establish a connection to the remote
     geocoding service, or the service responded with a code indicating
@@ -99,7 +99,7 @@ class GeocoderParseError(GeocoderServiceError):
     """
 
 
-class GeocoderNotFound(GeopyError):
+class GeocoderNotFound(GeopyError, ValueError):
     """
     Caller requested the geocoder matching a string, e.g.,
     ``"google"`` > ``GoogleV3``, but no geocoder could be found.

test/test_exc.py

@@ -0,0 +1,20 @@
+import inspect
+
+import pytest
+
+import geopy.exc
+
+error_classes = sorted(
+    [
+        v
+        for v in (getattr(geopy.exc, name) for name in dir(geopy.exc))
+        if inspect.isclass(v) and issubclass(v, geopy.exc.GeopyError)
+    ],
+    key=lambda cls: cls.__name__,
+)
+
+
+@pytest.mark.parametrize("error_cls", error_classes)
+def test_init(error_cls):
+    with pytest.raises(error_cls):
+        raise error_cls("dummy")