requiresthat 2025.6.17.0__py3-none-any.whl → 2025.6.18.1__py3-none-any.whl

requiresthat/__init__.py

@@ -1 +1,8 @@
-from ._requires import requires, RequirementNotFulfilledError, APRIORI, POSTMORTEM, BEFOREANDAFTER
+from ._requires import (
+    requires,
+    RequirementNotFulfilledError,
+    NoCallableConstructError,
+    APRIORI,
+    POSTMORTEM,
+    BEFOREANDAFTER,
+)

requiresthat/_exceptions.py

@@ -1,14 +1,33 @@
-"""Raise this when a requirement is found wanting"""
-
 import textwrap
 
 class RequirementNotFulfilledError(Exception):
+    """Raise this when a requirement is found wanting"""
 
-    def __init__(self, that, when, msg=None):
+    def __init__(self, that, when, subwhen=str(), msg=None):
         """Show a default or a user-provided message indicating that some condition is unmet"""
 
+        if subwhen:
+            subwhen = f' ({subwhen.name!r})'
         self.default_msg = textwrap.dedent(f"""
-            {that!r} ({when.name!r}) does not hold
+            {that!r} ({when.name!r}{subwhen}) does not hold
+        """).strip()
+
+        # Call the base class' constructor to init the exception class
+        super().__init__(msg or self.default_msg)
+
+class NoCallableConstructError(Exception):
+    """Raise this when a construct is not callable"""
+
+    def __init__(self, construct, msg=None):
+        """Show a default or a user-provided message"""
+
+        self.default_msg = textwrap.dedent(f"""
+            {construct!r} does not seem to be callable
+
+            You have managed to place the decorator before a construct that is not callable
+            *without* tripping the Python interpreter.  Maybe you are a wizard?
+
+            But, no, we can't carry on like that.  Sorry!
         """).strip()
 
         # Call the base class' constructor to init the exception class

requiresthat/_requires.py

@@ -4,7 +4,7 @@ from typing import Optional, Callable
 from functools import wraps
 
 from ._when import When, APRIORI, POSTMORTEM, BEFOREANDAFTER
-from ._exceptions import RequirementNotFulfilledError
+from ._exceptions import RequirementNotFulfilledError, NoCallableConstructError
 
 def requires(that, when: When = APRIORI) -> Optional[Callable]:
     """Require <that> of the decoratee, and require it <when>"""
@@ -19,22 +19,43 @@ def requires(that, when: When = APRIORI) -> Optional[Callable]:
             The wrapping stops here...
             """
             try:
+                assert callable(func)
+            except AssertionError as exc:
+                raise NoCallableConstructError(func) from exc
+            else:
+                # Since we want to give detailed sub-failure diax in case of BEFOREANDAFTER,
+                # economisng on the ifs below is tricky.
                 if when == APRIORI:
-                    assert eval(that)
-                    # We can use a return here :-)
-                    return func(self, *pargs, **kwargs)
+                    try:
+                        assert eval(that)
+                    except AssertionError as exc:
+                        raise RequirementNotFulfilledError(that, when) from exc
+                    else:
+                        func(self, *pargs, **kwargs)
+
                 elif when == POSTMORTEM:
                     func(self, *pargs, **kwargs)
-                    assert eval(that)
+                    try:
+                        assert eval(that)
+                    except AssertionError as exc:
+                        raise RequirementNotFulfilledError(that, when) from exc
+
                 elif when == BEFOREANDAFTER:
-                    assert eval(that)
-                    func(self, *pargs, **kwargs)
-                    assert eval(that)
+                    try:
+                        assert eval(that)
+                    except AssertionError as exc:
+                        raise RequirementNotFulfilledError(that, when, APRIORI) from exc
+                    else:
+                        func(self, *pargs, **kwargs)
+                    try:
+                        assert eval(that)
+                    except AssertionError as exc:
+                        raise RequirementNotFulfilledError(that, when, POSTMORTEM) from exc
+
                 # We don't need an else clause; trying to enlist something that's not in the enum
                 # will be penalised with an AttributeError, and small typos will be healed with a
                 # suggestion as to what you might have meant.
-            except AssertionError as exc:
-                raise RequirementNotFulfilledError(that, when) from exc
+
         return inner_wrapper
 
     return func_wrapper

{requiresthat-2025.6.17.0.dist-info → requiresthat-2025.6.18.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: requiresthat
-Version: 2025.6.17.0
+Version: 2025.6.18.1
 Summary: Support for requirements-assisted development
 Author-email: Ann T Ropea <bedhanger@gmx.de>
 License-Expression: MIT

requiresthat-2025.6.18.1.dist-info/RECORD

@@ -0,0 +1,8 @@
+requiresthat/__init__.py,sha256=VTyJru4K2_e7UEa0od6kXU7M8ovfD176GXEXqtNf-nY,154
+requiresthat/_exceptions.py,sha256=-Q9lhvHnSapP_UGMAnlXxwDaGcxagULIe5oP5h8a2IU,1275
+requiresthat/_requires.py,sha256=5hQMT5T5VZuQj6W13108j_cedx4wKzJ7Kt4xseOR4cI,2447
+requiresthat/_when.py,sha256=VoGuvoG9WDEMIPeKnxAsjMTaCMhgSszf4xxa1vLn5aU,299
+requiresthat-2025.6.18.1.dist-info/METADATA,sha256=anVc8oEKzMwwStJ7PH7tCHDLFBaQ0qTNteQd3-ZbJ5s,1575
+requiresthat-2025.6.18.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+requiresthat-2025.6.18.1.dist-info/top_level.txt,sha256=mUgMTpAG75GYtt5_rVajUyWp-O_1VrrkqRo_hY9L9So,13
+requiresthat-2025.6.18.1.dist-info/RECORD,,

requiresthat-2025.6.17.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-requiresthat/__init__.py,sha256=-pvz61UhmWhwzjbKTHQ83_YqZx1MXQEvqSgb7Q0d9jE,99
-requiresthat/_exceptions.py,sha256=bgrTgn3JCJv_KbYIpaghZ8v-SP5fiOpzeFC5zB8uq8M,504
-requiresthat/_requires.py,sha256=F28tp_3L_E06ERsSGkPx-YrbBolmGO1NymJZINtocts,1562
-requiresthat/_when.py,sha256=VoGuvoG9WDEMIPeKnxAsjMTaCMhgSszf4xxa1vLn5aU,299
-requiresthat-2025.6.17.0.dist-info/METADATA,sha256=w3FELaW74-gCOcfxFo9DaiTkLGGJ1LlA17Ka_2itPYM,1575
-requiresthat-2025.6.17.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-requiresthat-2025.6.17.0.dist-info/top_level.txt,sha256=mUgMTpAG75GYtt5_rVajUyWp-O_1VrrkqRo_hY9L9So,13
-requiresthat-2025.6.17.0.dist-info/RECORD,,