zstdlib 0.10.1__tar.gz → 0.10.3__tar.gz

{zstdlib-0.10.1 → zstdlib-0.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zstdlib
-Version: 0.10.1
+Version: 0.10.3
 Summary: A set of useful python utilities
 License: GPLv3
 Project-URL: Homepage, https://github.com/zwimer/zstdlib

{zstdlib-0.10.1 → zstdlib-0.10.3}/tests/test_exc_capture.py

@@ -19,6 +19,14 @@ class TestLazy(unittest.TestCase):
         with self.assertRaises(ValueError), rt.capture():
             raise ValueError()
         self.assertEqual(len(rt.errors), 1)
+        # previous
+        with rt.capture():
+            pass
+        self.assertIs(rt.previous, None)
+        test_err = RuntimeError("test")
+        with rt.capture():
+            raise test_err
+        self.assertEqual(rt.previous, test_err)
         # capture's exc_t
         rt = ExcCapture(RuntimeError)
         with self.assertRaises(RuntimeError), rt.capture(ValueError):
@@ -68,6 +76,14 @@ class TestLazy(unittest.TestCase):
         _ = ExcDelay("")
         with self.assertRaises(TypeError):
             ExcDelay(RuntimeError)  # type: ignore[arg-type]
+        # armed
+        with ExcDelay("", RuntimeError, armed=False) as capture, capture():
+            raise RuntimeError()
+        with ExcDelay("", RuntimeError, armed=True) as capture, capture():
+            capture.armed = False
+            raise RuntimeError()
+        with self.assertRaises(ExceptionGroup), ExcDelay("", RuntimeError, armed=True) as capture, capture():
+            raise RuntimeError()
 
 
 if __name__ == "__main__":

{zstdlib-0.10.1 → zstdlib-0.10.3}/zstdlib/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.10.1"
+__version__ = "0.10.3"
 
 from .exc_capture import ExcCapture, ExcDelay
 from .not_set import NotSetType, NotSet

{zstdlib-0.10.1 → zstdlib-0.10.3}/zstdlib/exc_capture.py

@@ -1,6 +1,6 @@
 from contextlib import AbstractContextManager, contextmanager
 from collections.abc import Iterator
-from typing import Protocol
+from typing import Self
 
 __all__ = ("ExcCapture", "ExcDelay")
 
@@ -8,16 +8,10 @@ __all__ = ("ExcCapture", "ExcDelay")
 type EXC_T = type[BaseException] | tuple[type[BaseException]]
 
 
-class CaptureFType(Protocol):
-    """The type of the capture function (used for type checking)"""
-
-    def __call__(self, exc_t: EXC_T | None = None) -> AbstractContextManager[None]: ...
-
-
 class ExcCapture:
     """A class that exposes a context manager which captures and suppresses any raised exception of a given type / tuple of types"""
 
-    __slots__ = ("errors", "exc_t")
+    __slots__ = ("errors", "exc_t", "previous")
 
     def __init__(self, exc_t: EXC_T | None = None) -> None:
         """
@@ -25,47 +19,61 @@ class ExcCapture:
             msg: The exception group message
             exc_t: The exception type the capture function should capture, if None it must be passed to the capture function directly
         """
-        self.exc_t: EXC_T | None = exc_t
+        self.previous: BaseException | None = None  # The result of the last capture() invocation
         self.errors: list[BaseException] = []
+        self.exc_t: EXC_T | None = exc_t
 
     @contextmanager
     def capture(self, exc_t: EXC_T | None = None) -> Iterator[None]:
-        """Capture and suppress any exception if type/tuple of types exc_t (self.exc_t if None)"""
+        """
+        Capture and suppress any exception if type/tuple of types exc_t (self.exc_t if None)
+        This function sets self.previous on exit
+        """
         exc_t = self.exc_t if exc_t is None else exc_t
         if exc_t is None:
             raise ValueError("No exception type provided here nor during construction")
         try:
             yield
+            self.previous = None
         except exc_t as e:
+            self.previous = e
             self.errors.append(e)
 
+    def __call__(self, exc_t: EXC_T | None = None) -> AbstractContextManager[None]:
+        """An alias for .capture"""
+        return self.capture(exc_t)
+
 
 class ExcDelay(ExcCapture):
     """A context manager subclass of ExcCapture that raises on exit if errors are captured"""
 
-    __slots__ = ("_msg",)
+    __slots__ = ("_msg", "armed")
 
     def __init__(
         self,
         msg: str,
         exc_t: type[BaseException] | None = None,
+        *,
+        armed: bool = True,
     ) -> None:
         """
         Args:
             msg: The exception group message
             exc_t: The exception type the capture function should capture, if None it must be passed to the capture function directly
+            armed: If False, do not raise on context exit if self.errors
         """
         if not isinstance(msg, str):
             raise TypeError(f"Invalid message type: {type(msg)}")
+        self.armed: bool = armed
         self._msg: str = msg
         super().__init__(exc_t)
 
-    def __enter__(self) -> CaptureFType:
+    def __enter__(self) -> Self:
         """Return the capture function to use"""
-        return self.capture
+        return self
 
     def __exit__(self, type_: type[BaseException] | None, *_: object) -> None:
         """Raise an ExceptionGroup (or BaseExceptionGroup depending on exc_t) if self.errors"""
-        if type_ is None and self.errors:
+        if type_ is None and self.errors and self.armed:
             # Auto-converts to ExceptionGroup if all items are Exceptions
             raise BaseExceptionGroup(self._msg, self.errors)

{zstdlib-0.10.1 → zstdlib-0.10.3}/zstdlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zstdlib
-Version: 0.10.1
+Version: 0.10.3
 Summary: A set of useful python utilities
 License: GPLv3
 Project-URL: Homepage, https://github.com/zwimer/zstdlib