From 1145d9424b0fc4ae5ff82719a53e4e067be592c3 Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Mon, 7 Jul 2014 15:19:18 +1000 Subject: [PATCH] Use jsonutils to load adapter response This is not technically needed, however we and the libraries we use, aren't very good about keeping our strings and bytes straight for python 3. jsonutils has an attempt to decode stage that means we can let it manage the correct types. Change-Id: I2caf4a5b9a04495aa0286f2b6e3193a17ff246e5 --- keystoneclient/adapter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keystoneclient/adapter.py b/keystoneclient/adapter.py index 6e5af481a..1018b02b9 100644 --- a/keystoneclient/adapter.py +++ b/keystoneclient/adapter.py @@ -10,6 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. +from keystoneclient.openstack.common import jsonutils from keystoneclient import utils @@ -108,7 +109,7 @@ class LegacyJsonAdapter(Adapter): body = None if resp.text: try: - body = resp.json() + body = jsonutils.loads(resp.text) except ValueError: pass