String: raise Invalid on deserialization from a non-string (fixes #100)

Pylons · Aug 16, 2013 · 30f002e · 30f002e
1 parent b46bde7
commit 30f002e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/colander/__init__.py b/colander/__init__.py
@@ -1121,7 +1121,7 @@ def deserialize(self, node, cstruct):
                 else:
                     result = text_type(cstruct)
             else:
-                result = text_type(cstruct)
+                raise Invalid(node)
         except Exception as e:
             raise Invalid(node,
                           _('${val} is not a string: ${err}',

diff --git a/colander/tests/test_colander.py b/colander/tests/test_colander.py
@@ -1329,11 +1329,11 @@ def test_deserialize_unicode_from_None(self):
         self.assertEqual(result, uni)
 
     def test_deserialize_nonunicode_from_None(self):
+        import colander
         value = object()
         node = DummySchemaNode(None)
         typ = self._makeOne()
-        result = typ.deserialize(node, value)
-        self.assertEqual(result, text_type(value))
+        self.assertRaises(colander.Invalid, typ.deserialize, node, value)
 
     def test_deserialize_from_utf8(self):
         uni = text_(b'\xe3\x81\x82', encoding='utf-8')
@@ -1351,6 +1351,13 @@ def test_deserialize_from_utf16(self):
         result = typ.deserialize(node, utf16)
         self.assertEqual(result, uni)
 
+    def test_deserialize_from_nonstring_obj(self):
+        import colander
+        value = object()
+        node = DummySchemaNode(None)
+        typ = self._makeOne()
+        self.assertRaises(colander.Invalid, typ.deserialize, node, value)
+
     def test_serialize_null(self):
         from colander import null
         node = DummySchemaNode(None)