Merge "rpc: clean JSON serializer, remove strtime() usage"
This commit is contained in:
commit
ea62e2e7a9
|
@ -54,20 +54,23 @@ CONF.register_opts(rpc_opts)
|
|||
|
||||
class RPCJSONSerializer(wsgi.JSONResponseSerializer):
|
||||
|
||||
def _sanitizer(self, obj):
|
||||
def to_primitive(_type, _value):
|
||||
return {"_type": _type, "_value": _value}
|
||||
@staticmethod
|
||||
def _to_primitive(_type, _value):
|
||||
return {"_type": _type, "_value": _value}
|
||||
|
||||
def _sanitizer(self, obj):
|
||||
if isinstance(obj, datetime.datetime):
|
||||
return to_primitive("datetime", timeutils.strtime(obj))
|
||||
return self._to_primitive("datetime",
|
||||
obj.isoformat())
|
||||
|
||||
return super(RPCJSONSerializer, self)._sanitizer(obj)
|
||||
|
||||
|
||||
class RPCJSONDeserializer(wsgi.JSONRequestDeserializer):
|
||||
|
||||
def _to_datetime(self, obj):
|
||||
return timeutils.parse_strtime(obj)
|
||||
@staticmethod
|
||||
def _to_datetime(obj):
|
||||
return timeutils.normalize_time(timeutils.parse_isotime(obj))
|
||||
|
||||
def _sanitizer(self, obj):
|
||||
try:
|
||||
|
|
|
@ -260,7 +260,7 @@ class TestRPCJSONSerializer(test_utils.BaseTestCase):
|
|||
|
||||
def test_to_json_with_date_format_value(self):
|
||||
fixture = {"date": datetime.datetime(1900, 3, 8, 2)}
|
||||
expected = {"date": {"_value": "1900-03-08T02:00:00.000000",
|
||||
expected = {"date": {"_value": "1900-03-08T02:00:00",
|
||||
"_type": "datetime"}}
|
||||
actual = rpc.RPCJSONSerializer().to_json(fixture)
|
||||
actual = jsonutils.loads(actual)
|
||||
|
|
Loading…
Reference in New Issue