x/wsme
Code Issues Proposed changes

Merged in dhellmann/wsme-validate (pull request #1)

Browse Source
This commit is contained in:
Christophe de Vienne 2012-11-29 22:18:11 +01:00
commit cbb5caf4bf
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wsme/tests/test_types.py
View File

@ -269,6 +269,11 @@ class TestTypes(unittest.TestCase):
except ValueError:
pass
def test_validate_float(self):
self.assertEqual(types.validate_value(float, 1), 1.0)
self.assertEqual(types.validate_value(float, '1'), 1.0)
self.assertEqual(types.validate_value(float, 1.1), 1.1)
def test_register_invalid_array(self):
self.assertRaises(ValueError, types.register_type, [])
self.assertRaises(ValueError, types.register_type, [int, str])

2
wsme/types.py
View File

@ -218,6 +218,8 @@ def validate_value(datatype, value):
value = value.decode()
elif datatype is bytes and isinstance(value, text):
value = value.encode()
elif datatype is float and not isinstance(value, float):
value = float(value)
elif not isinstance(value, datatype):
raise ValueError(
"Wrong type. Expected '%s', got '%s'" % (