openstack
/
openstacksdk
Code Issues Proposed changes

Merge "Strip two more accept headers from object-storage"

This commit is contained in:
Zuul 2019-09-10 10:53:06 +00:00 committed by Gerrit Code Review
parent ca780d3bb8 5f252e882e
commit f56d7b9a29
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack/object_store/v1/obj.py
View File

@ -269,7 +269,6 @@ class Object(_base.BaseResource):
def _download(self, session, error_message=None, stream=False): def _download(self, session, error_message=None, stream=False):
request = self._prepare_request() request = self._prepare_request()
request.headers['Accept'] = 'bytes'
response = session.get( response = session.get(
request.url, headers=request.headers, stream=stream) request.url, headers=request.headers, stream=stream)
@ -307,9 +306,8 @@ class Object(_base.BaseResource):
# Fetch metadata to determine SLO flag # Fetch metadata to determine SLO flag
self.head(session) self.head(session)
headers = { headers = {}
'Accept': ""
}
if self.is_static_large_object: if self.is_static_large_object:
headers['multipart-manifest'] = 'delete' headers['multipart-manifest'] = 'delete'

2
openstack/tests/unit/object_store/v1/test_obj.py
View File

@ -105,7 +105,7 @@ class TestObject(base_test_object.BaseTestObject):
headers = { headers = {
'X-Newest': 'True', 'X-Newest': 'True',
'If-Match': self.headers['Etag'], 'If-Match': self.headers['Etag'],
'Accept': 'bytes' 'Accept': '*/*'
} }
self.register_uris([ self.register_uris([
dict(method='GET', uri=self.object_endpoint, dict(method='GET', uri=self.object_endpoint,