clean up raises

Author: hamelsmu

fastcore/net.py

@@ -17,8 +17,8 @@
 # %% ../nbs/03b_net.ipynb 1
 from .utils import *
 from .parallel import *
+
 from functools import wraps
-from pprint import pformat
 import json,urllib,contextlib
 import socket,urllib.request,http,urllib
 from contextlib import contextmanager,ExitStack
@@ -106,9 +106,8 @@ def urlopen(url, data=None, headers=None, timeout=None, **kwargs):
         if not isinstance(data, bytes): data = data.encode('ascii')
     try: return urlopener().open(urlwrap(url, data=data, headers=headers), timeout=timeout)
     except HTTPError as e: 
-        e.msg += f"\n====Error Body====\n{pformat(json.loads(e.read()))}"
-        raise e
-    except Exception as e: raise e
+        e.msg += f"\n====Error Body====\n{e.read().decode(errors='ignore')}"
+        raise
 
 # %% ../nbs/03b_net.ipynb 20
 def urlread(url, data=None, headers=None, decode=True, return_json=False, return_headers=False, timeout=None, **kwargs):

nbs/03b_net.ipynb

@@ -18,8 +18,8 @@
     "#|export\n",
     "from fastcore.utils import *\n",
     "from fastcore.parallel import *\n",
+    "\n",
     "from functools import wraps\n",
-    "from pprint import pformat\n",
     "import json,urllib,contextlib\n",
     "import socket,urllib.request,http,urllib\n",
     "from contextlib import contextmanager,ExitStack\n",
@@ -184,7 +184,7 @@
       "text/markdown": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/net.py#L64){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/net.py#L63){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "#### HTTP4xxClientError\n",
        "\n",
@@ -195,7 +195,7 @@
       "text/plain": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/net.py#L64){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/net.py#L63){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "#### HTTP4xxClientError\n",
        "\n",
@@ -223,7 +223,7 @@
       "text/markdown": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/net.py#L69){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/net.py#L68){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "#### HTTP5xxServerError\n",
        "\n",
@@ -234,7 +234,7 @@
       "text/plain": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/net.py#L69){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/net.py#L68){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "#### HTTP5xxServerError\n",
        "\n",
@@ -315,9 +315,8 @@
     "        if not isinstance(data, bytes): data = data.encode('ascii')\n",
     "    try: return urlopener().open(urlwrap(url, data=data, headers=headers), timeout=timeout)\n",
     "    except HTTPError as e: \n",
-    "        e.msg += f\"\\n====Error Body====\\n{pformat(json.loads(e.read()))}\"\n",
-    "        raise e\n",
-    "    except Exception as e: raise e"
+    "        e.msg += f\"\\n====Error Body====\\n{e.read().decode(errors='ignore')}\"\n",
+    "        raise"
    ]
   },
   {
@@ -338,7 +337,11 @@
      "text": [
       "404 Not Found\n",
       "====Error Body====\n",
-      "{'documentation_url': 'https://docs.github.com/rest', 'message': 'Not Found'}\n"
+      "{\n",
+      "  \"message\": \"Not Found\",\n",
+      "  \"documentation_url\": \"https://docs.github.com/rest\"\n",
+      "}\n",
+      "\n"
      ]
     }
    ],