Merge pull request #163 from spoqa/fix-locale-territory

Fix locale territory parsing

CHANGES.rst

@@ -9,8 +9,9 @@ Here you can see the full list of changes between each SQLAlchemy-Utils release.
 
 - Made has_index allow fk constraint as parameter
 - Made has_unique_index allow fk constraint as parameter
-- Made the extra packages in setup.py to be returned in deterministic order
+- Made the extra packages in setup.py to be returned in deterministic order (courtesy of thomasgoirand)
 - Removed is_indexed_foreign_key (superceded by more versatile has_index)
+- Fixed LocaleType territory parsing (courtesy of dahlia)
 
 
 0.30.17 (2015-08-16)

sqlalchemy_utils/types/locale.py

@@ -67,7 +67,7 @@ class LocaleType(types.TypeDecorator, ScalarCoercible):
 
     def process_result_value(self, value, dialect):
         if value is not None:
-            return babel.Locale(value)
+            return babel.Locale.parse(value)
 
     def _coerce(self, value):
         if value is not None and not isinstance(value, babel.Locale):

tests/types/test_locale.py

@@ -28,6 +28,14 @@ class TestLocaleType(TestCase):
 
         user = self.session.query(self.User).first()
 
+    def test_territory_parsing(self):
+        ko_kr = locale.babel.Locale(u'ko', territory=u'KR')
+        user = self.User(locale=ko_kr)
+        self.session.add(user)
+        self.session.commit()
+
+        assert self.session.query(self.User.locale).first()[0] == ko_kr
+
     def test_scalar_attributes_get_coerced_to_objects(self):
         user = self.User(locale='en_US')