diff --git a/novaclient/base.py b/novaclient/base.py index 328b25126..1b2c590ce 100644 --- a/novaclient/base.py +++ b/novaclient/base.py @@ -28,7 +28,7 @@ import threading from oslo_utils import reflection from oslo_utils import strutils -from requests import Response +import requests import six from novaclient import exceptions @@ -103,7 +103,7 @@ class RequestIdMixin(object): self._append_request_id(resp) def _append_request_id(self, resp): - if isinstance(resp, Response): + if isinstance(resp, requests.Response): # Extract 'x-openstack-request-id' from headers if # response is a Response object. request_id = (resp.headers.get('x-openstack-request-id') or diff --git a/novaclient/tests/unit/test_base.py b/novaclient/tests/unit/test_base.py index eb70dff99..0b1ee83aa 100644 --- a/novaclient/tests/unit/test_base.py +++ b/novaclient/tests/unit/test_base.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -from requests import Response +import requests import six from novaclient import api_versions @@ -23,13 +23,13 @@ from novaclient.v2 import flavors def create_response_obj_with_header(): - resp = Response() + resp = requests.Response() resp.headers['x-openstack-request-id'] = fakes.FAKE_REQUEST_ID return resp def create_response_obj_with_compute_header(): - resp = Response() + resp = requests.Response() resp.headers['x-compute-request-id'] = fakes.FAKE_REQUEST_ID return resp