Merge "Removed unused parameter in dt_deserializer()"

This commit is contained in:
Jenkins
2016-02-03 00:13:38 +00:00
committed by Gerrit Code Review
2 changed files with 4 additions and 5 deletions

View File

@@ -117,7 +117,7 @@ def dt_serializer(name):
return serializer
def dt_deserializer(instance, val):
def dt_deserializer(val):
"""A deserializer method for datetime attributes."""
if val is None:
return None

View File

@@ -172,10 +172,9 @@ class TestUtils(test_base.TestCase):
def test_dt_deserializer(self):
dt = timeutils.parse_isotime('1955-11-05T00:00:00Z')
self.assertEqual(utils.dt_deserializer(None, timeutils.isotime(dt)),
dt)
self.assertIsNone(utils.dt_deserializer(None, None))
self.assertRaises(ValueError, utils.dt_deserializer, None, 'foo')
self.assertEqual(utils.dt_deserializer(timeutils.isotime(dt)), dt)
self.assertIsNone(utils.dt_deserializer(None))
self.assertRaises(ValueError, utils.dt_deserializer, 'foo')
def test_obj_to_primitive_list(self):
class MyList(base.ObjectListBase, base.WatcherObject):