diff -Nru python-magnumclient-2.11.0/debian/changelog python-magnumclient-2.11.0/debian/changelog --- python-magnumclient-2.11.0/debian/changelog 2021-08-02 15:43:01.000000000 -0400 +++ python-magnumclient-2.11.0/debian/changelog 2022-06-24 11:41:10.000000000 -0400 @@ -1,3 +1,10 @@ +python-magnumclient (2.11.0-0ubuntu6) focal; urgency=medium + + * d/p/Fix-failing-to-parse-json-error-msg.patch: Fix failing to parse json + error msg (LP: #1979663). + + -- Felipe Reyes Fri, 24 Jun 2022 11:41:10 -0400 + python-magnumclient (2.11.0-0ubuntu5) focal; urgency=medium [ Corey Bryant ] diff -Nru python-magnumclient-2.11.0/debian/patches/Fix-failing-to-parse-json-error-msg.patch python-magnumclient-2.11.0/debian/patches/Fix-failing-to-parse-json-error-msg.patch --- python-magnumclient-2.11.0/debian/patches/Fix-failing-to-parse-json-error-msg.patch 1969-12-31 21:00:00.000000000 -0300 +++ python-magnumclient-2.11.0/debian/patches/Fix-failing-to-parse-json-error-msg.patch 2022-06-24 11:41:10.000000000 -0400 @@ -0,0 +1,38 @@ +From f7551a6bac103070ff456098fe2631409620d492 Mon Sep 17 00:00:00 2001 +From: Tobias Urdin +Date: Wed, 18 Nov 2020 11:46:44 +0100 +Subject: [PATCH] Fix failing to parse json error msg + +It assumes its a requests response but could +be a HTTPResponse from urllib. + +Story: 2008789 +Task: 42183 + +Change-Id: I7306d167a17284c7f478ec1c1599a8d4b32040c2 +--- + magnumclient/common/httpclient.py | 3 +++ + 1 file changed, 3 insertions(+) + +Index: python-magnumclient-2.11.0/magnumclient/common/httpclient.py +=================================================================== +--- python-magnumclient-2.11.0.orig/magnumclient/common/httpclient.py ++++ python-magnumclient-2.11.0/magnumclient/common/httpclient.py +@@ -23,6 +23,7 @@ import socket + import ssl + + from keystoneauth1 import adapter ++from oslo_serialization import jsonutils + from oslo_utils import importutils + import six + import six.moves.urllib.parse as urlparse +@@ -65,6 +66,9 @@ def _extract_error_json(body, resp): + try: + body_json = resp.json() + return _extract_error_json_text(body_json) ++ except AttributeError: ++ body_json = jsonutils.loads(body) ++ return _extract_error_json_text(body_json) + except ValueError: + return {} + else: diff -Nru python-magnumclient-2.11.0/debian/patches/series python-magnumclient-2.11.0/debian/patches/series --- python-magnumclient-2.11.0/debian/patches/series 2021-08-02 15:43:01.000000000 -0400 +++ python-magnumclient-2.11.0/debian/patches/series 2022-06-24 11:40:58.000000000 -0400 @@ -1 +1,2 @@ fix-py37-compatibility.patch +Fix-failing-to-parse-json-error-msg.patch