swift 2.34.0__py2.py3-none-any.whl → 2.34.1__py2.py3-none-any.whl

swift/common/middleware/listing_formats.py

@@ -18,6 +18,7 @@ import six
 from xml.etree.cElementTree import Element, SubElement, tostring
 
 from swift.common.constraints import valid_api_version
+from swift.common.header_key_dict import HeaderKeyDict
 from swift.common.http import HTTP_NO_CONTENT
 from swift.common.request_helpers import get_param
 from swift.common.swob import HTTPException, HTTPNotAcceptable, Request, \
@@ -178,52 +179,39 @@ class ListingFilter(object):
             start_response(status, headers)
             return resp_iter
 
-        header_to_index = {}
-        resp_content_type = resp_length = None
-        for i, (header, value) in enumerate(headers):
-            header = header.lower()
-            if header == 'content-type':
-                header_to_index[header] = i
-                resp_content_type = value.partition(';')[0]
-            elif header == 'content-length':
-                header_to_index[header] = i
-                resp_length = int(value)
-            elif header == 'vary':
-                header_to_index[header] = i
-
         if not status.startswith(('200 ', '204 ')):
             start_response(status, headers)
             return resp_iter
 
+        headers_dict = HeaderKeyDict(headers)
+        resp_content_type = headers_dict.get(
+            'content-type', '').partition(';')[0]
+        resp_length = headers_dict.get('content-length')
+
         if can_vary:
-            if 'vary' in header_to_index:
-                value = headers[header_to_index['vary']][1]
+            if 'vary' in headers_dict:
+                value = headers_dict['vary']
                 if 'accept' not in list_from_csv(value.lower()):
-                    headers[header_to_index['vary']] = (
-                        'Vary', value + ', Accept')
+                    headers_dict['vary'] = value + ', Accept'
             else:
-                headers.append(('Vary', 'Accept'))
+                headers_dict['vary'] = 'Accept'
 
         if resp_content_type != 'application/json':
-            start_response(status, headers)
+            start_response(status, list(headers_dict.items()))
             return resp_iter
 
-        if resp_length is None or \
-                resp_length > MAX_CONTAINER_LISTING_CONTENT_LENGTH:
-            start_response(status, headers)
+        if req.method == 'HEAD':
+            headers_dict['content-type'] = out_content_type + '; charset=utf-8'
+            # proxy logging (and maybe other mw?) seem to be good about
+            # sticking this on HEAD/204 but we do it here to be responsible
+            # and explicit
+            headers_dict['content-length'] = 0
+            start_response(status, list(headers_dict.items()))
             return resp_iter
 
-        def set_header(header, value):
-            if value is None:
-                del headers[header_to_index[header]]
-            else:
-                headers[header_to_index[header]] = (
-                    headers[header_to_index[header]][0], str(value))
-
-        if req.method == 'HEAD':
-            set_header('content-type', out_content_type + '; charset=utf-8')
-            set_header('content-length', None)  # don't know, can't determine
-            start_response(status, headers)
+        if resp_length is None or \
+                int(resp_length) > MAX_CONTAINER_LISTING_CONTENT_LENGTH:
+            start_response(status, list(headers_dict.items()))
             return resp_iter
 
         body = b''.join(resp_iter)
@@ -237,7 +225,7 @@ class ListingFilter(object):
         except ValueError:
             # Static web listing that's returning invalid JSON?
             # Just pass it straight through; that's about all we *can* do.
-            start_response(status, headers)
+            start_response(status, list(headers_dict.items()))
             return [body]
 
         if not req.allow_reserved_names:
@@ -257,16 +245,16 @@ class ListingFilter(object):
                 body = json.dumps(listing).encode('ascii')
         except KeyError:
             # listing was in a bad format -- funky static web listing??
-            start_response(status, headers)
+            start_response(status, list(headers_dict.items()))
             return [body]
 
         if not body:
             status = '%s %s' % (HTTP_NO_CONTENT,
                                 RESPONSE_REASONS[HTTP_NO_CONTENT][0])
 
-        set_header('content-type', out_content_type + '; charset=utf-8')
-        set_header('content-length', len(body))
-        start_response(status, headers)
+        headers_dict['content-type'] = out_content_type + '; charset=utf-8'
+        headers_dict['content-length'] = len(body)
+        start_response(status, list(headers_dict.items()))
         return [body]
 
 

swift/common/middleware/x_profile/html_viewer.py

@@ -245,7 +245,7 @@ class HTMLViewer(object):
         if multiple:
             return value
         if isinstance(value, list):
-            return eval(value[0]) if isinstance(default, int) else value[0]
+            return int(value[0]) if isinstance(default, int) else value[0]
         else:
             return value
 

swift/common/middleware/xprofile.py

@@ -16,6 +16,11 @@
 """
 Profiling middleware for Swift Servers.
 
+.. note::
+    This middleware is intended for development and testing environments only,
+    not production. No authentication is expected or required for the web UI,
+    and profiling may incur noticeable performance penalties.
+
 The current implementation is based on eventlet aware profiler.(For the
 future, more profilers could be added in to collect more data for analysis.)
 Profiling all incoming requests and accumulating cpu timing statistics

{swift-2.34.0.dist-info → swift-2.34.1.dist-info}/METADATA

@@ -1,16 +1,14 @@
 Metadata-Version: 2.1
 Name: swift
-Version: 2.34.0
+Version: 2.34.1
 Summary: OpenStack Object Storage
 Home-page: https://docs.openstack.org/swift/latest/
 Author: OpenStack
 Author-email: openstack-discuss@lists.openstack.org
-License: UNKNOWN
 Project-URL: Documentation, https://docs.openstack.org/swift/latest/
 Project-URL: Bug Tracker, https://bugs.launchpad.net/swift
 Project-URL: Source Code, https://opendev.org/openstack/swift/
 Project-URL: Release Notes, https://opendev.org/openstack/swift/src/branch/master/CHANGELOG
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: OpenStack
 Classifier: Intended Audience :: Information Technology
@@ -29,38 +27,40 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/x-rst
-Requires-Dist: PasteDeploy (>=2.0.0)
-Requires-Dist: PyECLib (>=1.3.1)
-Requires-Dist: cryptography (>=2.0.2)
-Requires-Dist: eventlet (!=0.34.3,>=0.25.0)
-Requires-Dist: greenlet (>=0.3.2)
-Requires-Dist: lxml (>=4.2.3)
-Requires-Dist: requests (>=2.14.2)
-Requires-Dist: six (>=1.10.0)
-Requires-Dist: xattr (>=0.4) ; (sys_platform!='win32')
+License-File: LICENSE
+License-File: AUTHORS
+Requires-Dist: eventlet !=0.34.3,>=0.25.0
+Requires-Dist: greenlet >=0.3.2
+Requires-Dist: PasteDeploy >=2.0.0
+Requires-Dist: lxml >=4.2.3
+Requires-Dist: requests >=2.14.2
+Requires-Dist: six >=1.10.0
+Requires-Dist: PyECLib >=1.3.1
+Requires-Dist: cryptography >=2.0.2
+Requires-Dist: xattr >=0.4 ; (sys_platform!='win32')
 Provides-Extra: keystone
-Requires-Dist: keystonemiddleware (>=4.17.0) ; extra == 'keystone'
+Requires-Dist: keystonemiddleware >=4.17.0 ; extra == 'keystone'
 Provides-Extra: kmip_keymaster
-Requires-Dist: pykmip (>=0.7.0) ; extra == 'kmip_keymaster'
+Requires-Dist: pykmip >=0.7.0 ; extra == 'kmip_keymaster'
 Provides-Extra: kms_keymaster
-Requires-Dist: castellan (>=0.13.0) ; extra == 'kms_keymaster'
-Requires-Dist: oslo.config (!=4.3.0,!=4.4.0,>=4.0.0) ; extra == 'kms_keymaster'
+Requires-Dist: oslo.config !=4.3.0,!=4.4.0,>=4.0.0 ; extra == 'kms_keymaster'
+Requires-Dist: castellan >=0.13.0 ; extra == 'kms_keymaster'
 Provides-Extra: test
-Requires-Dist: bandit (>=1.1.0) ; extra == 'test'
-Requires-Dist: boto3 (>=1.9) ; extra == 'test'
-Requires-Dist: boto (>=2.32.1) ; extra == 'test'
-Requires-Dist: botocore (>=1.12) ; extra == 'test'
-Requires-Dist: coverage (>=5.0.4) ; extra == 'test'
-Requires-Dist: docutils (>=0.11) ; extra == 'test'
-Requires-Dist: hacking (<6.2.0,>=2.0) ; extra == 'test'
-Requires-Dist: keystonemiddleware (>=4.17.0) ; extra == 'test'
-Requires-Dist: mock (>=3.0) ; extra == 'test'
-Requires-Dist: pytest-cov (>=2.12.1) ; extra == 'test'
-Requires-Dist: pytest (>=4.6.11) ; extra == 'test'
-Requires-Dist: python-keystoneclient (!=2.1.0,>=2.0.0) ; extra == 'test'
-Requires-Dist: python-swiftclient (>=3.2.0) ; extra == 'test'
-Requires-Dist: requests-mock (>=1.2.0) ; extra == 'test'
-Requires-Dist: stestr (>=2.0.0) ; extra == 'test'
+Requires-Dist: hacking <6.2.0,>=2.0 ; extra == 'test'
+Requires-Dist: coverage >=5.0.4 ; extra == 'test'
+Requires-Dist: pytest >=4.6.11 ; extra == 'test'
+Requires-Dist: pytest-cov >=2.12.1 ; extra == 'test'
+Requires-Dist: stestr >=2.0.0 ; extra == 'test'
+Requires-Dist: mock >=3.0 ; extra == 'test'
+Requires-Dist: python-swiftclient >=3.2.0 ; extra == 'test'
+Requires-Dist: python-keystoneclient !=2.1.0,>=2.0.0 ; extra == 'test'
+Requires-Dist: boto >=2.32.1 ; extra == 'test'
+Requires-Dist: boto3 >=1.9 ; extra == 'test'
+Requires-Dist: botocore >=1.12 ; extra == 'test'
+Requires-Dist: requests-mock >=1.2.0 ; extra == 'test'
+Requires-Dist: keystonemiddleware >=4.17.0 ; extra == 'test'
+Requires-Dist: bandit >=1.1.0 ; extra == 'test'
+Requires-Dist: docutils >=0.11 ; extra == 'test'
 
 ===============
 OpenStack Swift
@@ -222,5 +222,3 @@ Thanks,
 
 The Swift Development Team
 
-
-

{swift-2.34.0.dist-info → swift-2.34.1.dist-info}/RECORD

@@ -75,7 +75,7 @@ swift/common/middleware/gatekeeper.py,sha256=OlF-Qk1OZ-XKE3tCoKv0TNn-wOnWLHwvqeF
 swift/common/middleware/healthcheck.py,sha256=3F4UgutBgQpTYfe_Oh2Kh8cQfUbdT0_k4BrmZnjK97M,2075
 swift/common/middleware/keystoneauth.py,sha256=JUkP2wI8sq3tL6iWYMK_2S9CQvUtnBbB6Jw8J1LOOzI,26901
 swift/common/middleware/list_endpoints.py,sha256=LkBJhLoREsw7Sy3O0HEOEXO8k2N4sx32hEvILsJzUow,10060
-swift/common/middleware/listing_formats.py,sha256=GEKnBQAe3f0_4NQcLahL9aD8UFNzvzkji-GLBdvksB8,10610
+swift/common/middleware/listing_formats.py,sha256=mtxvTW1sRjO3Z6tI-7OdcAlT4DtRjh-U_M7r-HqkfsI,10285
 swift/common/middleware/memcache.py,sha256=YENYsIaZZ1wM1IWfmlJzVrAfF0Eb0HF8YAwuj1HupoY,1308
 swift/common/middleware/name_check.py,sha256=K3PzYs7lW1fe7anYFdcC6ijMChcsvNbtw4Sio8Dec_8,5366
 swift/common/middleware/proxy_logging.py,sha256=43cZKy_fQ8HM0wmC68q8ZVQgx3DLsu3UY_0fmu9m5Ps,22822
@@ -87,7 +87,7 @@ swift/common/middleware/staticweb.py,sha256=oNxI2t9un_osgtDF2Q-hinsGdjHHA7W1sza3
 swift/common/middleware/symlink.py,sha256=qzKpxDg1400uYCVs2ia0f-cz2Ty--sP70qALymCsWfw,35236
 swift/common/middleware/tempauth.py,sha256=pNKJpk1KJ2MwePYFQnY-HphjctL6IFTwnRGFiCvBS80,38354
 swift/common/middleware/tempurl.py,sha256=Ht35uJkxULsTlxPZ8WkY85HAeQt5FL3tU047d_IqgOs,36758
-swift/common/middleware/xprofile.py,sha256=zJFFhdvJhKWb02yF-aTZUE2oM2YatDUmfdZgnrg0CG0,9883
+swift/common/middleware/xprofile.py,sha256=rrHv35ms1AngC8dv8VQIeN4c5g0SC5xYWVXAEV1EXUE,10113
 swift/common/middleware/crypto/__init__.py,sha256=ZI-Tnqg3AMVgDzAhkWFtAlKFJqXGAzYMzSquwK2OnUk,1498
 swift/common/middleware/crypto/crypto_utils.py,sha256=jKDJEJf-C434dHgLh1X4CWxB95UnHGOOV7JNY-vysjM,11400
 swift/common/middleware/crypto/decrypter.py,sha256=JmL2tZSCNylS9J3UYl6y0nIaZAZ0FIbUlhj8t2jQ_eM,20408
@@ -145,7 +145,7 @@ swift/common/middleware/versioned_writes/legacy.py,sha256=OLXfy7h_P-zyBDbxRjhrNe
 swift/common/middleware/versioned_writes/object_versioning.py,sha256=HAxehk0_f7LiLeHEeE3IScxGGfFMNaeEr8weQILNVvc,66014
 swift/common/middleware/x_profile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 swift/common/middleware/x_profile/exceptions.py,sha256=BRhoEqEl5_XIY_ArhvveRkHMO0xHx8V-H7w7M_Siz-E,1020
-swift/common/middleware/x_profile/html_viewer.py,sha256=rY7dFsKNipMh9ohr0x5HY8eCQOg2UE_cYFVA3tokwuQ,21346
+swift/common/middleware/x_profile/html_viewer.py,sha256=SYLIdAk6ahTeoS7WW8sGnlI7n3ot0srJ03nfEtxQFLI,21345
 swift/common/middleware/x_profile/profile_model.py,sha256=iaje5iihcj52U8jGzLmYwmG0_cJI8JFHXxsBhBJfwCw,10202
 swift/common/ring/__init__.py,sha256=WgGFseZj8r2UtBCBcZiCgzbUoWCGv4ND1MCEv5IW7aA,758
 swift/common/ring/builder.py,sha256=N61Pcx2vX7JAnEdXR3HR12vd9iC4htOImo-rBKuswf0,81478
@@ -203,11 +203,11 @@ swift/proxy/controllers/base.py,sha256=JWpkm9MdhtF5Z6VmVp-XCbRpUTTsx1SU6-OQRWWEC
 swift/proxy/controllers/container.py,sha256=_JXDujs-AgX3eui327WD3vP7jcsKQCEcyyKdiye8rZU,37114
 swift/proxy/controllers/info.py,sha256=QSvBwBJjwO3QIktINMCjcYgBi-QAi3wHWKmyf4AtQz8,3859
 swift/proxy/controllers/obj.py,sha256=RZNzjx_UqW_X8qqlRRt8B9600X4VEQUIrFrytSORfD8,149191
-swift-2.34.0.dist-info/AUTHORS,sha256=Z7RxslERjvhbWgO8F2cfxn9ccH-AvwpK7v0G52eBAlE,18282
-swift-2.34.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-swift-2.34.0.dist-info/METADATA,sha256=444qSA2NeCKmr85F7UUtXQwcITY1dlxUsovMbKNG_xU,8742
-swift-2.34.0.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
-swift-2.34.0.dist-info/entry_points.txt,sha256=-ZUwCyKbiL2gTvd7X2gLEGno319gApVKBENA-5ED4Ko,4925
-swift-2.34.0.dist-info/pbr.json,sha256=GKlZK3fFYdawi1EUrXg5yOLWYtKLKMbUyeriZ0ZdklY,48
-swift-2.34.0.dist-info/top_level.txt,sha256=nVzNOToyzq0MM7JtrpalfOaPV9UIfm_lXhHX0duhVps,6
-swift-2.34.0.dist-info/RECORD,,
+swift-2.34.1.dist-info/AUTHORS,sha256=Z7RxslERjvhbWgO8F2cfxn9ccH-AvwpK7v0G52eBAlE,18282
+swift-2.34.1.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+swift-2.34.1.dist-info/METADATA,sha256=bLkpfGZZPCracuOS7t0qUPSkGQQPn99n-S8E5OUnijk,8693
+swift-2.34.1.dist-info/WHEEL,sha256=Ll72iyqtt6Rbxp-Q7FSafYA1LeRv98X15xcZWRsFEmY,109
+swift-2.34.1.dist-info/entry_points.txt,sha256=sABN-wA_ikxyB37MhGggO1bY5Tb4hidL-LJBWSb3gKs,4924
+swift-2.34.1.dist-info/pbr.json,sha256=UWz7nqcJdHDGZUsr14JqVppzYxu_mClXPK8lCW4rQCQ,48
+swift-2.34.1.dist-info/top_level.txt,sha256=nVzNOToyzq0MM7JtrpalfOaPV9UIfm_lXhHX0duhVps,6
+swift-2.34.1.dist-info/RECORD,,

{swift-2.34.0.dist-info → swift-2.34.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.34.2)
+Generator: setuptools (75.3.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

{swift-2.34.0.dist-info → swift-2.34.1.dist-info}/entry_points.txt

@@ -93,4 +93,3 @@ replication.fs = swift.obj.diskfile:DiskFileManager
 
 [swift.object_audit_watcher]
 dark_data = swift.obj.watchers.dark_data:DarkDataWatcher
-

swift-2.34.1.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "5f776b6ee", "is_release": true}

swift-2.34.0.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "0e41e1790", "is_release": true}