more ExceptionExpected

Author: jph00

fastcore/__init__.py

@@ -1 +1 @@
-__version__ = "1.1.2"
+__version__ = "1.1.3"

fastcore/_nbdev.py

@@ -18,6 +18,7 @@
          "TEST_IMAGE_BW": "00_test.ipynb",
          "test_fig_exists": "00_test.ipynb",
          "ExceptionExpected": "00_test.ipynb",
+         "exception": "00_test.ipynb",
          "defaults": "01_foundation.ipynb",
          "copy_func": "01_foundation.ipynb",
          "patch_to": "01_foundation.ipynb",

fastcore/test.py

@@ -2,7 +2,7 @@
 
 __all__ = ['test_fail', 'test', 'nequals', 'test_eq', 'test_eq_type', 'test_ne', 'is_close', 'test_close', 'test_is',
            'test_shuffled', 'test_stdout', 'test_warns', 'TEST_IMAGE', 'TEST_IMAGE_BW', 'test_fig_exists',
-           'ExceptionExpected']
+           'ExceptionExpected', 'exception']
 
 # Cell
 from .imports import *
@@ -101,12 +101,13 @@ def test_fig_exists(ax):
 
 # Cell
 class ExceptionExpected:
-    "A context manager to allow you to test if an exception (ex) is raised. Optionally, search the exception's error message with a regex."
-    def __init__(self, ex:Exception, regex:str=None):store_attr()
+    "Context manager that tests if an exception is raised"
+    def __init__(self, ex=Exception, regex=''): store_attr()
     def __enter__(self): pass
     def __exit__(self, type, value, traceback):
-        if isinstance(value, self.ex):
-            if self.regex:
-                assert re.search(self.regex, ' '.join(value.args)) is not None, f"Did not find regex:{self.regex} in Exception message."
-            return True
-        else: raise TypeError(f"An error of {self.ex} was not raised.")
+        if not isinstance(value, self.ex) or (self.regex and not re.search(self.regex, f'{value.args}')):
+            raise TypeError(f"Expected {self.ex.__name__}({self.regex}) not raised.")
+        return True
+
+# Cell
+exception = ExceptionExpected()

fastcore/utils.py

@@ -675,6 +675,9 @@ def __init__(self, mgrs): self.default,self.stack = L(mgrs),ExitStack()
     def __enter__(self): self.default.map(self.stack.enter_context)
     def __exit__(self, *args, **kwargs): self.stack.__exit__(*args, **kwargs)
 
+# Cell
+def _typeerr(arg, val, typ): return TypeError(f"{arg}=={val} not {typ}")
+
 # Cell
 def typed(f):
     "Decorator to check param and return types at runtime"
@@ -686,9 +689,9 @@ def _f(*args,**kwargs):
         if len(anno) > 0:
             for i,arg in enumerate(args): kw[names[i]] = arg
             for k,v in kw.items():
-                if not isinstance(v,anno[k]): raise TypeError(f"{k}=={v} not {anno[k]}")
+                if not isinstance(v,anno[k]): raise _typeerr(k, v, anno[k])
         res = f(*args,**kwargs)
-        if ret is not None and not isinstance(res,ret): raise TypeError(f"return=={res} not {ret}")
+        if ret is not None and not isinstance(res,ret): raise _typeerr("return", res, ret)
         return res
     return functools.update_wrapper(_f, f)
 

nbs/00_test.ipynb

@@ -2171,7 +2171,7 @@
     {
      "data": {
       "text/plain": [
-       "['e', 'a', 'h', 'f', 'g', 'b', 'c', 'd']"
+       "['h', 'f', 'd', 'g', 'a', 'b', 'c', 'e']"
       ]
      },
      "execution_count": null,
@@ -3621,6 +3621,16 @@
     "show_doc(ContextManagers, title_level=4)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#export\n",
+    "def _typeerr(arg, val, typ): return TypeError(f\"{arg}=={val} not {typ}\")"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -3638,9 +3648,9 @@
     "        if len(anno) > 0:\n",
     "            for i,arg in enumerate(args): kw[names[i]] = arg\n",
     "            for k,v in kw.items():\n",
-    "                if not isinstance(v,anno[k]): raise TypeError(f\"{k}=={v} not {anno[k]}\")\n",
+    "                if not isinstance(v,anno[k]): raise _typeerr(k, v, anno[k])\n",
     "        res = f(*args,**kwargs)\n",
-    "        if ret is not None and not isinstance(res,ret): raise TypeError(f\"return=={res} not {ret}\")\n",
+    "        if ret is not None and not isinstance(res,ret): raise _typeerr(\"return\", res, ret)\n",
     "        return res\n",
     "    return functools.update_wrapper(_f, f)"
    ]

nbs/02_utils.ipynb

@@ -7,7 +7,7 @@ author = Jeremy Howard and Sylvain Gugger
 author_email = [email protected]
 copyright = fast.ai
 branch = master
-version = 1.1.2
+version = 1.1.3
 min_python = 3.6
 audience = Developers
 language = English