summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-05-27 01:56:02 +0000
committerGerrit Code Review <review@openstack.org>2021-05-27 01:56:02 +0000
commit4b0d6a87e9b2d0a032fe3b3a85e6fef0e5e8839f (patch)
tree4e9461e767ac2410928e35c45cde282ed06e5633
parent91e5a9525cdf83f430fe4eab23f51070d8c7a056 (diff)
parent18d8c15f93a0969281c9758e9d089556d7e0e2eb (diff)
downloadswift-4b0d6a87e9b2d0a032fe3b3a85e6fef0e5e8839f.tar.gz
Merge "symlink: Ensure headers are returned as a list on py3" into stable/ussuriussuri-em2.25.2
-rw-r--r--swift/common/middleware/symlink.py2
-rw-r--r--test/unit/common/middleware/test_symlink.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/swift/common/middleware/symlink.py b/swift/common/middleware/symlink.py
index d2c644438..e4c40cefc 100644
--- a/swift/common/middleware/symlink.py
+++ b/swift/common/middleware/symlink.py
@@ -421,7 +421,7 @@ class SymlinkObjectContext(WSGIContext):
resp = self._app_call(req.environ)
response_header_dict = HeaderKeyDict(self._response_headers)
symlink_sysmeta_to_usermeta(response_header_dict)
- self._response_headers = response_header_dict.items()
+ self._response_headers = list(response_header_dict.items())
return resp
def handle_get_head(self, req):
diff --git a/test/unit/common/middleware/test_symlink.py b/test/unit/common/middleware/test_symlink.py
index 01875ba48..37acc0e20 100644
--- a/test/unit/common/middleware/test_symlink.py
+++ b/test/unit/common/middleware/test_symlink.py
@@ -402,6 +402,7 @@ class TestSymlinkMiddleware(TestSymlinkMiddlewareBase):
req = Request.blank('/v1/a/c/symlink?symlink=get', method='GET')
status, headers, body = self.call_sym(req)
self.assertEqual(status, '200 OK')
+ self.assertIsInstance(headers, list)
self.assertIn(('X-Symlink-Target', 'c1/o'), headers)
self.assertNotIn('X-Symlink-Target-Account', dict(headers))