vatin: Use more generic exception instead of ValidationError children

Author: unho

stdnum/vatin.py

@@ -66,11 +66,12 @@ def _get_cc_module(cc):
     # Greece uses a "wrong" country code, special case for Northern Ireland
     cc = cc.lower().replace('el', 'gr').replace('xi', 'gb')
     if not _country_code_re.match(cc):
-        raise InvalidFormat()
+        raise ImportError('Wrong "{}" country code.'.format(cc))
     if cc not in _country_modules:
         _country_modules[cc] = get_cc_module(cc, 'vat')
     if not _country_modules[cc]:
-        raise InvalidComponent()  # unknown/unsupported country code
+        raise ImportError('Missing validation for "{}" country code.'
+                          ''.format(cc))
     return _country_modules[cc]
 
 
@@ -98,5 +99,7 @@ def is_valid(number):
     """Check if the number is a valid VAT number."""
     try:
         return bool(validate(number))
+    except ImportError:
+        return False
     except ValidationError:
         return False

tests/test_vatin.doctest

@@ -61,20 +61,20 @@ Try validating not specifying a country:
 >>> vatin.validate('')
 Traceback (most recent call last):
     ...
-InvalidFormat: ...
+ImportError: ...
 >>> vatin.validate('00')
 Traceback (most recent call last):
     ...
-InvalidFormat: ...
+ImportError: ...
 
 
 Try to validate for countries with no VAT validation:
 
 >>> vatin.validate('XX')
 Traceback (most recent call last):
     ...
-InvalidComponent: ...
+ImportError: ...
 >>> vatin.validate('US')
 Traceback (most recent call last):
     ...
-InvalidComponent: ...
+ImportError: ...