fix: parenthesize Py2 multi-exception except clauses so the package imports

except A, B: is Py2 syntax (catch A, bind to name B) and fails to parse
under Py3 — it broke 'import s3proxy', so the whole pytest suite couldn't
collect (conftest imports s3proxy.concurrency). Parenthesize the 8 sites
across utils, concurrency, request_handler and dashboard/* to catch both
types as intended.

Lets the list-objects self-check import the real module directly (drops the
sibling-stubbing workaround).

Author: ServerSideHannes

s3proxy/concurrency.py

@@ -36,7 +36,7 @@ def _create_malloc_release() -> Callable[[], int] | None:
         libc.malloc_trim.argtypes = [ctypes.c_size_t]
         libc.malloc_trim.restype = ctypes.c_int
         return lambda: libc.malloc_trim(0)
-    except OSError, AttributeError:
+    except (OSError, AttributeError):
         return None
 
 

s3proxy/dashboard/collectors.py

@@ -134,7 +134,7 @@ def _latency_percentiles(cumulative: dict[str, float] | None = None) -> dict[str
             continue
         try:
             buckets.append((float(le), float(count)))
-        except ValueError, TypeError:
+        except (ValueError, TypeError):
             continue
     if total < 1 and buckets:
         total = max(c for _, c in buckets)

s3proxy/dashboard/stats_store.py

@@ -561,7 +561,7 @@ async def series(self, metric: str, range_key: str) -> tuple[list[float], list[f
         for k, v in raw.items():
             try:
                 points.append((int(k), float(v)))
-            except ValueError, TypeError:
+            except (ValueError, TypeError):
                 continue
         return bucket_series(points, window, bucket)
 
@@ -642,7 +642,7 @@ def _hfloat(h: dict, field: bytes) -> float:
         return 0.0
     try:
         return float(v)
-    except ValueError, TypeError:
+    except (ValueError, TypeError):
         return 0.0
 
 
@@ -652,7 +652,7 @@ def _decode_float_map(h: dict) -> dict[str, float]:
         key = k.decode() if isinstance(k, bytes) else str(k)
         try:
             out[key] = float(v)
-        except ValueError, TypeError:
+        except (ValueError, TypeError):
             continue
     return out
 
@@ -665,7 +665,7 @@ def _loads_sample(raw: bytes) -> RequestSample | None:
     try:
         d = orjson.loads(raw)
         return RequestSample(**d)
-    except ValueError, TypeError:
+    except (ValueError, TypeError):
         return None
 
 

s3proxy/request_handler.py

@@ -214,7 +214,7 @@ async def _handle_proxy_request_impl(
     dispatcher = RequestDispatcher(handler)
     try:
         return await dispatcher.dispatch(request, verified_creds)
-    except HTTPException, S3Error:
+    except (HTTPException, S3Error):
         raise
     except UnknownKidError as e:
         logger.warning("Cannot decrypt object: key not configured", kid=e.kid)

s3proxy/utils.py

@@ -17,7 +17,7 @@ def parse_http_date(date_str: str | None) -> datetime | None:
         return None
     try:
         return parsedate_to_datetime(date_str)
-    except ValueError, TypeError:
+    except (ValueError, TypeError):
         return None
 
 

tests/unit/test_list_objects_parallel.py

@@ -3,59 +3,18 @@
 Sequential HEADs on a recursive list stack into a client-timeout-tripping stall.
 This proves: HEADs run concurrently, output order matches input order, internal
 keys are skipped, and a failing HEAD falls back to the listed size/etag.
-
-The repo's package __init__ chain currently pulls in modules with pre-existing
-Py2 `except A, B:` syntax (utils.py, dashboard/*) that won't import under Py3,
-so we load buckets.py directly with stubbed siblings to exercise the real code.
 """
 
 import asyncio
 import datetime as dt
-import importlib.util
-import sys
-import types
-from pathlib import Path
-
-REPO = Path(__file__).resolve().parents[2]
-
-
-def _load_buckets():
-    def stub(name, **attrs):
-        m = types.ModuleType(name)
-        for k, v in attrs.items():
-            setattr(m, k, v)
-        sys.modules[name] = m
-        return m
-
-    stub("s3proxy")
-    stub("s3proxy.handlers")
-    stub("s3proxy.xml_responses")
-    stub("s3proxy.client", S3Credentials=object)
-    stub("s3proxy.errors", S3Error=type("S3Error", (Exception,), {}))
-    stub(
-        "s3proxy.state",
-        INTERNAL_PREFIX="s3proxy-internal/",
-        META_SUFFIX_LEGACY=".s3proxy-meta",
-        delete_multipart_metadata=lambda *a, **k: None,
-    )
-    stub("s3proxy.xml_utils", find_element=lambda *a, **k: None, find_elements=lambda *a, **k: [])
-    stub("s3proxy.handlers.base", BaseHandler=object)
-
-    spec = importlib.util.spec_from_file_location(
-        "s3proxy.handlers.buckets", REPO / "s3proxy" / "handlers" / "buckets.py"
-    )
-    mod = importlib.util.module_from_spec(spec)
-    sys.modules["s3proxy.handlers.buckets"] = mod
-    spec.loader.exec_module(mod)
-    return mod
-
-
-buckets = _load_buckets()
+
+from s3proxy.handlers.buckets import LIST_HEAD_CONCURRENCY, BucketHandlerMixin
+
 INTERNAL_PREFIX = "s3proxy-internal/"
 
 
 class FakeHandler:
-    _process_list_objects = buckets.BucketHandlerMixin._process_list_objects
+    _process_list_objects = BucketHandlerMixin._process_list_objects
 
     def __init__(self):
         self.inflight = 0
@@ -120,7 +79,7 @@ def test_parallel_order_and_fallback():
     assert result[1]["etag"] == "raw-etag"
     # HEADs actually ran concurrently (would be 1 if sequential), and stayed bounded.
     assert handler.max_inflight > 1
-    assert handler.max_inflight <= buckets.LIST_HEAD_CONCURRENCY
+    assert handler.max_inflight <= LIST_HEAD_CONCURRENCY
 
 
 if __name__ == "__main__":