Merge branch 'release/1.0.7'

CHANGELOG.rst

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+Release *v1.0.7* - ``2016-03-13``
+---------------------------------
+* ensure falsy values are considered as so
+
 Release *v1.0.6* - ``2016-02-12``
 ---------------------------------
 * add compatibility with "display" values set using ``ugettext_lazy``

extended_choices/__init__.py

@@ -7,4 +7,4 @@
 __author__ = 'Stephane "Twidi" Ange;'
 __contact__ = "[email protected]"
 __homepage__ = "https://pypi.python.org/pypi/django-extended-choices"
-__version__ = "1.0.6"
+__version__ = "1.0.7"

extended_choices/helpers.py

@@ -188,6 +188,10 @@ def __reduce__(self):
             )
         )
 
+    def __bool__(self):
+        """Use the original value to know if the value is truely of falsy"""
+        return bool(self.original_value)
+
     _classes_by_type = {}
 
 

extended_choices/tests.py

@@ -982,6 +982,26 @@ def test_django_ugettext_lazy(self):
         deep_copied_choices = deepcopy(lazy_choices)
         self.assertEqual(deep_copied_choices, lazy_choices)
 
+    def test_bool(self):
+        """Test that having 0 or "" return `False` in a boolean context"""
+
+        bool_choices = Choices(
+            ('', 0, ''),
+            ('FOO', 1, 'bar'),
+        )
+
+        first = bool_choices.for_value(0)
+        second = bool_choices.for_value(1)
+
+        self.assertFalse(first.constant)
+        self.assertFalse(first.value)
+        self.assertFalse(first.display)
+
+        self.assertTrue(second.constant)
+        self.assertTrue(second.value)
+        self.assertTrue(second.display)
+
+
 
 if __name__ == "__main__":
     unittest.main()

setup.py

@@ -19,7 +19,7 @@ def read_relative_file(filename):
 
 setup(
     name="django-extended-choices",
-    version="1.0.6",
+    version="1.0.7",
     license="BSD",
     description="Little helper application to improve django choices"
     "(for fields)",