Allow the use of 'missing=None' for Number

Pylons · Aug 15, 2012 · 24f648d · 24f648d
1 parent 979cd65
commit 24f648d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,12 @@
 Changes
 =======
 
+Next release
+------------
+
+- Allow the use of 'missing=None' for Number.  See
+  https://github.com/Pylons/colander/pull/59 .
+
 0.9.8 (2012-04-27)
 ------------------
 

diff --git a/colander/__init__.py b/colander/__init__.py
@@ -951,7 +951,7 @@ class Number(SchemaType):
     num = None
 
     def serialize(self, node, appstruct):
-        if not appstruct:
+        if appstruct in (null, None):
             return null
 
         try:

diff --git a/colander/tests/test_colander.py b/colander/tests/test_colander.py
@@ -1192,6 +1192,13 @@ def test_serialize_ok(self):
         result = typ.serialize(node, val)
         self.assertEqual(result, '1')
 
+    def test_serialize_zero(self):
+        val = 0
+        node = DummySchemaNode(None)
+        typ = self._makeOne()
+        result = typ.serialize(node, val)
+        self.assertEqual(result, '0')
+
 class TestFloat(unittest.TestCase):
     def _makeOne(self):
         from colander import Float

diff --git a/setup.py b/setup.py
@@ -32,7 +32,7 @@
 docs_extras = ['Sphinx']
 
 setup(name='colander',
-      version='0.9.8',
+      version='0.9.9dev1',
       description=('A simple schema-based serialization and deserialization '
                    'library'),
       long_description=README + '\n\n' +  CHANGES,