From 909c17a77980ba179328cc8a715b0d510b73cb40 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Fri, 6 Mar 2020 17:17:33 +0000 Subject: [PATCH] Remove Python 3-specific conditional in dump_as_bytes Now that we only support Python 3 we don't need logic to handle Python 2. Change-Id: I33747d25bc4c67ee13654ed132edf7413371c1dc --- oslo_serialization/jsonutils.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/oslo_serialization/jsonutils.py b/oslo_serialization/jsonutils.py index 17b978e..0e310b1 100644 --- a/oslo_serialization/jsonutils.py +++ b/oslo_serialization/jsonutils.py @@ -214,11 +214,7 @@ def dump_as_bytes(obj, default=to_primitive, encoding='utf-8', **kwargs): .. versionadded:: 1.10 """ - serialized = dumps(obj, default=default, **kwargs) - if isinstance(serialized, str): - # On Python 3, json.dumps() returns Unicode - serialized = serialized.encode(encoding) - return serialized + return dumps(obj, default=default, **kwargs).encode(encoding) def dump(obj, fp, *args, **kwargs):