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

openstack/object_store/v1/obj.py

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

openstack/tests/unit/object_store/v1/test_obj.py

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