Merge pull request #282 from django-import-export/fix-274-0-is-interp…

…reted-as-none

FIX: #274 0 is interpreted as None

docs/changelog.rst

@@ -4,6 +4,8 @@ Changelog for django-import-export
 0.2.8 (unreleased)
 ------------------
 
+- Fix 0 is interpreted as None in number widgets (#274)
+
 - add possibility to override tmp storage class (#133, #251)
 
 

import_export/widgets.py

@@ -38,6 +38,10 @@ def render(self, value):
 
 class NumberWidget(Widget):
 
+    def is_empty(self, value):
+        # 0 is not empty
+        return value is None or value == ""
+
     def render(self, value):
         return value
 
@@ -48,9 +52,9 @@ class IntegerWidget(NumberWidget):
     """
 
     def clean(self, value):
-        if not value and value is not 0:
+        if self.is_empty(value):
             return None
-        return int(value)
+        return int(float(value))
 
 
 class DecimalWidget(NumberWidget):
@@ -59,7 +63,7 @@ class DecimalWidget(NumberWidget):
     """
 
     def clean(self, value):
-        if not value:
+        if self.is_empty(value):
             return None
         return Decimal(value)
 

tests/core/tests/resources_tests.py

@@ -225,11 +225,10 @@ def test_import_data_error_saving_model(self):
 
         self.assertTrue(result.has_errors())
         self.assertTrue(result.rows[0].errors)
-        msg = "invalid literal for int() with base 10: 'foo'"
         actual = result.rows[0].errors[0].error
         self.assertIsInstance(actual, ValueError)
-        self.assertEqual("Column 'id': invalid literal for int() with "
-            "base 10: 'foo'", str(actual))
+        self.assertIn("Column 'id': could not convert string to float",
+                      str(actual))
 
     def test_import_data_delete(self):
 

tests/core/tests/widgets_tests.py

@@ -103,6 +103,10 @@ def test_clean(self):
     def test_render(self):
         self.assertEqual(self.widget.render(self.value), self.value)
 
+    def test_clean_string_zero(self):
+        self.assertEqual(self.widget.clean("0"), Decimal("0"))
+        self.assertEqual(self.widget.clean("0.0"), Decimal("0"))
+
 
 class IntegerWidgetTest(TestCase):
 
@@ -115,6 +119,7 @@ def test_clean_integer_zero(self):
 
     def test_clean_string_zero(self):
         self.assertEqual(self.widget.clean("0"), self.value)
+        self.assertEqual(self.widget.clean("0.0"), self.value)
 
 
 class ForeignKeyWidgetTest(TestCase):