diff options
| author | Zuul <zuul@review.openstack.org> | 2018-12-02 05:44:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-12-02 05:44:55 +0000 |
| commit | f34f426a790535a94bb4a12bcc5f2b1353322091 (patch) | |
| tree | 7978c6b907ef559147b963f05b9a0bf1cf7f362f | |
| parent | 7c601903b2e5cdaa93473e6f5b2d083635a405d6 (diff) | |
| parent | 3a517714fab2b2d05418d27f347f275ffb6f5c98 (diff) | |
| download | swift-f34f426a790535a94bb4a12bcc5f2b1353322091.tar.gz | |
Merge "Py3: Use dict.items instead of dict.iteritems"
4 files changed, 5 insertions, 5 deletions
diff --git a/swift/common/middleware/s3api/controllers/multi_upload.py b/swift/common/middleware/s3api/controllers/multi_upload.py index f589ec3bf..51586bad0 100644 --- a/swift/common/middleware/s3api/controllers/multi_upload.py +++ b/swift/common/middleware/s3api/controllers/multi_upload.py @@ -541,7 +541,7 @@ class UploadController(Controller): upload_id = req.params['uploadId'] resp = _get_upload_info(req, self.app, upload_id) headers = {} - for key, val in resp.headers.iteritems(): + for key, val in resp.headers.items(): _key = key.lower() if _key.startswith('x-amz-meta-'): headers['x-object-meta-' + _key[11:]] = val diff --git a/swift/common/middleware/s3api/s3response.py b/swift/common/middleware/s3api/s3response.py index 9b78c6c26..fea4a8057 100644 --- a/swift/common/middleware/s3api/s3response.py +++ b/swift/common/middleware/s3api/s3response.py @@ -94,7 +94,7 @@ class S3Response(S3ResponseBase, swob.Response): s3api_sysmeta_prefix = sysmeta_prefix(_server_type).lower() return sysmeta_key.lower().startswith(s3api_sysmeta_prefix) - for key, val in self.headers.iteritems(): + for key, val in self.headers.items(): if is_sys_meta('object', key) or is_sys_meta('container', key): _server_type = key.split('-')[1] if is_swift3_sysmeta(key, _server_type): @@ -113,7 +113,7 @@ class S3Response(S3ResponseBase, swob.Response): sw_headers[key] = val # Handle swift headers - for key, val in sw_headers.iteritems(): + for key, val in sw_headers.items(): _key = key.lower() if _key.startswith('x-object-meta-'): diff --git a/test/unit/common/middleware/s3api/helpers.py b/test/unit/common/middleware/s3api/helpers.py index 8cf1b7963..fe8ba8f55 100644 --- a/test/unit/common/middleware/s3api/helpers.py +++ b/test/unit/common/middleware/s3api/helpers.py @@ -153,7 +153,7 @@ class FakeSwift(object): if (method, path) in self._responses: old_headers = self._responses[(method, path)][1] headers = headers.copy() - for key, value in old_headers.iteritems(): + for key, value in old_headers.items(): if is_sys_meta(resource, key) and key not in headers: # keep old sysmeta for s3acl headers.update({key: value}) diff --git a/test/unit/common/middleware/s3api/test_obj.py b/test/unit/common/middleware/s3api/test_obj.py index 08be5fee2..ef7bb839c 100644 --- a/test/unit/common/middleware/s3api/test_obj.py +++ b/test/unit/common/middleware/s3api/test_obj.py @@ -92,7 +92,7 @@ class TestS3ApiObj(S3ApiTestCase): self.assertEqual(status.split()[0], '200') unexpected_headers = [] - for key, val in self.response_headers.iteritems(): + for key, val in self.response_headers.items(): if key in ('Content-Length', 'Content-Type', 'content-encoding', 'last-modified', 'cache-control', 'Content-Disposition', 'Content-Language', 'expires', 'x-robots-tag'): |