openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Clean imports in code"

This commit is contained in:
Zuul 2018-02-22 05:52:56 +00:00 committed by Gerrit Code Review
parent 02343c2d8c bc4f9195ad
commit eaa5035682
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
novaclient/base.py
View File

@ -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

6
novaclient/tests/unit/test_base.py
View File

@ -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