fix(babel): pass validation if babel is not installed

kvesteri · Jul 16, 2018 · 634e26f · 634e26f
1 parent 70f4710
commit 634e26f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/sqlalchemy_utils/primitives/country.py b/sqlalchemy_utils/primitives/country.py
@@ -25,7 +25,8 @@ class Country(object):
 
         Country(Country('FI')).code  # 'FI'
 
-    Country always validates the given code.
+    Country always validates the given code if you use at least the optional
+    dependency list 'babel', otherwise no validation are performed.
 
     ::
 
@@ -76,6 +77,9 @@ def validate(self, code):
             raise ValueError(
                 'Could not convert string to country code: {0}'.format(code)
             )
+        except AttributeError:
+            # As babel is optional, we may raise an AttributeError accessing it
+            pass
 
     def __eq__(self, other):
         if isinstance(other, Country):

diff --git a/sqlalchemy_utils/primitives/currency.py b/sqlalchemy_utils/primitives/currency.py
@@ -26,7 +26,8 @@ class Currency(object):
 
         Currency(Currency('USD')).code  # 'USD'
 
-    Currency always validates the given code.
+    Currency always validates the given code if you use at least the optional
+    dependency list 'babel', otherwise no validation are performed.
 
     ::
 
@@ -75,6 +76,9 @@ def validate(self, code):
             i18n.babel.Locale('en').currencies[code]
         except KeyError:
             raise ValueError("'{0}' is not valid currency code.".format(code))
+        except AttributeError:
+            # As babel is optional, we may raise an AttributeError accessing it
+            pass
 
     @property
     def symbol(self):