Don't throw

Author: muellerzr

fastcore/_nbdev.py

@@ -188,7 +188,7 @@
          "utc2local": "03_xtras.ipynb",
          "local2utc": "03_xtras.ipynb",
          "trace": "03_xtras.ipynb",
-         "raise_with_msg": "03_xtras.ipynb",
+         "modify_exception": "03_xtras.ipynb",
          "round_multiple": "03_xtras.ipynb",
          "modified_env": "03_xtras.ipynb",
          "ContextManagers": "03_xtras.ipynb",

fastcore/xtras.py

@@ -8,7 +8,7 @@
            'walk', 'globtastic', 'maybe_open', 'image_size', 'bunzip', 'join_path_file', 'loads', 'loads_multi',
            'untar_dir', 'repo_details', 'run', 'open_file', 'save_pickle', 'load_pickle', 'get_source_link', 'truncstr',
            'spark_chars', 'sparkline', 'autostart', 'EventTimer', 'stringfmt_names', 'PartialFormatter',
-           'partial_format', 'utc2local', 'local2utc', 'trace', 'raise_with_msg', 'round_multiple', 'modified_env',
+           'partial_format', 'utc2local', 'local2utc', 'trace', 'modify_exception', 'round_multiple', 'modified_env',
            'ContextManagers', 'str2bool']
 
 # Cell
@@ -475,14 +475,14 @@ def _inner(*args,**kwargs):
     return _inner
 
 # Cell
-def raise_with_msg(
+def modify_exception(
     e:Exception, # An exception
-    msg:str|list=None, # A custom message
-    replace:bool=False # Whether to replace e.args with [msg]
-):
-    "Raises `e` with a custom message attached"
-    e.args = listify(msg) if replace else listify(e.args) + listify(msg)
-    raise e
+    msg:str=None, # A custom message
+    replace:bool=False, # Whether to replace e.args with [msg]
+) -> Exception:
+    "Modifies `e` with a custom message attached"
+    e.args = [f'{e.args[0]} {msg}'] if not replace and len(e.args) > 0 else [msg]
+    return e
 
 # Cell
 def round_multiple(x, mult, round_down=False):

nbs/03_xtras.ipynb

@@ -11,7 +11,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -21,7 +21,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -44,7 +44,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -2100,32 +2100,42 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 133,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 158,
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [],
    "source": [
     "#|export\n",
-    "def raise_with_msg(\n",
+    "def modify_exception(\n",
     "    e:Exception, # An exception\n",
-    "    msg:str|list=None, # A custom message\n",
-    "    replace:bool=False # Whether to replace e.args with [msg]\n",
-    "):\n",
-    "    \"Raises `e` with a custom message attached\"\n",
-    "    e.args = listify(msg) if replace else listify(e.args) + listify(msg)\n",
-    "    raise e"
+    "    msg:str=None, # A custom message\n",
+    "    replace:bool=False, # Whether to replace e.args with [msg]\n",
+    ") -> Exception:\n",
+    "    \"Modifies `e` with a custom message attached\"\n",
+    "    e.args = [f'{e.args[0]} {msg}'] if not replace and len(e.args) > 0 else [msg]\n",
+    "    return e"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 132,
+   "execution_count": 164,
    "metadata": {},
    "outputs": [],
    "source": [
     "msg = \"This is my custom message!\"\n",
-    "test_fail(lambda: raise_with_msg(Exception(), None), contains='')\n",
-    "test_fail(lambda: raise_with_msg(Exception(), msg), contains=msg)\n",
-    "test_fail(lambda: raise_with_msg(Exception(\"The first message\"), msg), contains=\"('The first message', 'This is my custom message!')\")\n",
-    "test_fail(lambda: raise_with_msg(Exception(\"The first message\"), msg, True), contains=\"This is my custom message!\")"
+    "\n",
+    "test_fail(lambda: (_ for _ in ()).throw(modify_exception(Exception(), None)), contains='')\n",
+    "test_fail(lambda: (_ for _ in ()).throw(modify_exception(Exception(), msg)), contains=msg)\n",
+    "test_fail(lambda: (_ for _ in ()).throw(modify_exception(Exception(\"The first message\"), msg)), contains=\"The first message This is my custom message!\")\n",
+    "test_fail(lambda: (_ for _ in ()).throw(modify_exception(Exception(\"The first message\"), msg, True)), contains=\"This is my custom message!\")"
    ]
   },
   {
@@ -2297,13 +2307,6 @@
     "from nbdev.export import notebook2script\n",
     "notebook2script()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {