fixes #444

Author: jph00

fastcore/__init__.py

@@ -1 +1 @@
-__version__ = "1.5.11"
+__version__ = "1.5.12"

fastcore/_modidx.py

@@ -23,7 +23,7 @@
                 'status': '4',
                 'title': 'fastcore',
                 'user': 'fastai',
-                'version': '1.5.11'},
+                'version': '1.5.12'},
   'syms': { 'fastcore.all': {},
             'fastcore.basics': { 'fastcore.basics.AttrDict': 'https://fastcore.fast.ai/basics.html#attrdict',
                                  'fastcore.basics.Float': 'https://fastcore.fast.ai/basics.html#float',
@@ -309,6 +309,7 @@
                               'fastcore.net.urldest': 'https://fastcore.fast.ai/net.html#urldest',
                               'fastcore.net.urljson': 'https://fastcore.fast.ai/net.html#urljson',
                               'fastcore.net.urlopen': 'https://fastcore.fast.ai/net.html#urlopen',
+                              'fastcore.net.urlopener': 'https://fastcore.fast.ai/net.html#urlopener',
                               'fastcore.net.urlquote': 'https://fastcore.fast.ai/net.html#urlquote',
                               'fastcore.net.urlread': 'https://fastcore.fast.ai/net.html#urlread',
                               'fastcore.net.urlrequest': 'https://fastcore.fast.ai/net.html#urlrequest',

fastcore/net.py

@@ -1,9 +1,9 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/03b_net.ipynb.
 
 # %% auto 0
-__all__ = ['url_default_headers', 'ExceptionsHTTP', 'urlquote', 'urlwrap', 'HTTP4xxClientError', 'HTTP5xxServerError', 'urlopen',
-           'urlread', 'urljson', 'urlcheck', 'urlclean', 'urlretrieve', 'urldest', 'urlsave', 'urlvalid', 'urlrequest',
-           'urlsend', 'do_request', 'start_server', 'start_client', 'HTTP400BadRequestError',
+__all__ = ['url_default_headers', 'ExceptionsHTTP', 'urlquote', 'urlwrap', 'HTTP4xxClientError', 'HTTP5xxServerError',
+           'urlopener', 'urlopen', 'urlread', 'urljson', 'urlcheck', 'urlclean', 'urlretrieve', 'urldest', 'urlsave',
+           'urlvalid', 'urlrequest', 'urlsend', 'do_request', 'start_server', 'start_client', 'HTTP400BadRequestError',
            'HTTP401UnauthorizedError', 'HTTP402PaymentRequiredError', 'HTTP403ForbiddenError', 'HTTP404NotFoundError',
            'HTTP405MethodNotAllowedError', 'HTTP406NotAcceptableError', 'HTTP407ProxyAuthRequiredError',
            'HTTP408RequestTimeoutError', 'HTTP409ConflictError', 'HTTP410GoneError', 'HTTP411LengthRequiredError',
@@ -71,9 +71,13 @@ class HTTP5xxServerError(HTTPError):
     pass
 
 # %% ../nbs/03b_net.ipynb 14
-_opener = urllib.request.build_opener()
-_opener.addheaders = list(url_default_headers.items())
-install_opener(_opener)
+def urlopener():
+    _opener = urllib.request.build_opener()
+    _opener.addheaders = list(url_default_headers.items())
+    return _opener
+
+# %% ../nbs/03b_net.ipynb 15
+# install_opener(_opener)
 
 _httperrors = (
     (400,'Bad Request'),(401,'Unauthorized'),(402,'Payment Required'),(403,'Forbidden'),(404,'Not Found'),
@@ -90,19 +94,19 @@ class HTTP5xxServerError(HTTPError):
     cls = get_class(nm, 'url', 'hdrs', 'fp', sup=HTTP4xxClientError, msg=msg, code=code)
     globals()[nm] = ExceptionsHTTP[code] = cls
 
-# %% ../nbs/03b_net.ipynb 15
+# %% ../nbs/03b_net.ipynb 16
 _all_ = ['HTTP400BadRequestError', 'HTTP401UnauthorizedError', 'HTTP402PaymentRequiredError', 'HTTP403ForbiddenError', 'HTTP404NotFoundError', 'HTTP405MethodNotAllowedError', 'HTTP406NotAcceptableError', 'HTTP407ProxyAuthRequiredError', 'HTTP408RequestTimeoutError', 'HTTP409ConflictError', 'HTTP410GoneError', 'HTTP411LengthRequiredError', 'HTTP412PreconditionFailedError', 'HTTP413PayloadTooLargeError', 'HTTP414URITooLongError', 'HTTP415UnsupportedMediaTypeError', 'HTTP416RangeNotSatisfiableError', 'HTTP417ExpectationFailedError', 'HTTP418AmAteapotError', 'HTTP421MisdirectedRequestError', 'HTTP422UnprocessableEntityError', 'HTTP423LockedError', 'HTTP424FailedDependencyError', 'HTTP425TooEarlyError', 'HTTP426UpgradeRequiredError', 'HTTP428PreconditionRequiredError', 'HTTP429TooManyRequestsError', 'HTTP431HeaderFieldsTooLargeError', 'HTTP451LegalReasonsError']
 
-# %% ../nbs/03b_net.ipynb 16
+# %% ../nbs/03b_net.ipynb 17
 def urlopen(url, data=None, headers=None, timeout=None, **kwargs):
     "Like `urllib.request.urlopen`, but first `urlwrap` the `url`, and encode `data`"
     if kwargs and not data: data=kwargs
     if data is not None:
         if not isinstance(data, (str,bytes)): data = urlencode(data)
         if not isinstance(data, bytes): data = data.encode('ascii')
-    return _opener.open(urlwrap(url, data=data, headers=headers), timeout=timeout)
+    return urlopener().open(urlwrap(url, data=data, headers=headers), timeout=timeout)
 
-# %% ../nbs/03b_net.ipynb 17
+# %% ../nbs/03b_net.ipynb 18
 def urlread(url, data=None, headers=None, decode=True, return_json=False, return_headers=False, timeout=None, **kwargs):
     "Retrieve `url`, using `data` dict or `kwargs` to `POST` if present"
     try:
@@ -115,13 +119,13 @@ def urlread(url, data=None, headers=None, decode=True, return_json=False, return
     if return_json: res = loads(res)
     return (res,dict(hdrs)) if return_headers else res
 
-# %% ../nbs/03b_net.ipynb 18
+# %% ../nbs/03b_net.ipynb 19
 def urljson(url, data=None, timeout=None):
     "Retrieve `url` and decode json"
     res = urlread(url, data=data, timeout=timeout)
     return json.loads(res) if res else {}
 
-# %% ../nbs/03b_net.ipynb 20
+# %% ../nbs/03b_net.ipynb 21
 def urlcheck(url, timeout=10):
     if not url: return True
     try:
@@ -130,12 +134,12 @@ def urlcheck(url, timeout=10):
     except socket.timeout: return False
     except InvalidURL: return False
 
-# %% ../nbs/03b_net.ipynb 21
+# %% ../nbs/03b_net.ipynb 22
 def urlclean(url):
     "Remove fragment, params, and querystring from `url` if present"
     return urlunparse(urlparse(str(url))[:3]+('','',''))
 
-# %% ../nbs/03b_net.ipynb 23
+# %% ../nbs/03b_net.ipynb 24
 def urlretrieve(url, filename=None, reporthook=None, data=None, timeout=None):
     "Same as `urllib.request.urlretrieve` but also works with `Request` objects"
     with contextlib.closing(urlopen(url, data, timeout=timeout)) as fp:
@@ -161,43 +165,43 @@ def urlretrieve(url, filename=None, reporthook=None, data=None, timeout=None):
         raise ContentTooShortError(f"retrieval incomplete: got only {read} out of {size} bytes", headers)
     return filename,headers
 
-# %% ../nbs/03b_net.ipynb 24
+# %% ../nbs/03b_net.ipynb 25
 def urldest(url, dest=None):
     name = urlclean(Path(url).name)
     if dest is None: dest = name
     dest = Path(dest)
     return dest/name if dest.is_dir() else dest
 
-# %% ../nbs/03b_net.ipynb 25
+# %% ../nbs/03b_net.ipynb 26
 def urlsave(url, dest=None, reporthook=None, timeout=None):
     "Retrieve `url` and save based on its name"
     dest = urldest(url, dest)
     dest.parent.mkdir(parents=True, exist_ok=True)
     nm,msg = urlretrieve(url, dest, reporthook, timeout=timeout)
     return nm
 
-# %% ../nbs/03b_net.ipynb 27
+# %% ../nbs/03b_net.ipynb 28
 def urlvalid(x):
     "Test if `x` is a valid URL"
     return all (getattrs(urlparse(str(x)), 'scheme', 'netloc'))
 
-# %% ../nbs/03b_net.ipynb 29
+# %% ../nbs/03b_net.ipynb 30
 def urlrequest(url, verb, headers=None, route=None, query=None, data=None, json_data=True):
     "`Request` for `url` with optional route params replaced by `route`, plus `query` string, and post `data`"
     if route: url = url.format(**route)
     if query: url += '?' + urlencode(query)
     if isinstance(data,dict): data = (json.dumps if json_data else urlencode)(data).encode('ascii')
     return Request(url, headers=headers or {}, data=data or None, method=verb.upper())
 
-# %% ../nbs/03b_net.ipynb 32
+# %% ../nbs/03b_net.ipynb 33
 @patch
 def summary(self:Request, skip=None)->dict:
     "Summary containing full_url, headers, method, and data, removing `skip` from headers"
     res = L('full_url','method','data').map_dict(partial(getattr,self))
     res['headers'] = {k:v for k,v in self.headers.items() if k not in listify(skip)}
     return res
 
-# %% ../nbs/03b_net.ipynb 34
+# %% ../nbs/03b_net.ipynb 35
 def urlsend(url, verb, headers=None, route=None, query=None, data=None, json_data=True,
             return_json=True, return_headers=False, debug=None):
     "Send request with `urlrequest`, converting result to json if `return_json`"
@@ -209,7 +213,7 @@ def urlsend(url, verb, headers=None, route=None, query=None, data=None, json_dat
 
     return urlread(req, return_json=return_json, return_headers=return_headers)
 
-# %% ../nbs/03b_net.ipynb 37
+# %% ../nbs/03b_net.ipynb 36
 def do_request(url, post=False, headers=None, **data):
     "Call GET or json-encoded POST on `url`, depending on `post`"
     if data:
@@ -219,13 +223,13 @@ def do_request(url, post=False, headers=None, **data):
             data = None
     return urljson(Request(url, headers=headers, data=data or None))
 
-# %% ../nbs/03b_net.ipynb 38
+# %% ../nbs/03b_net.ipynb 37
 def _socket_det(port,host,dgram):
     if isinstance(port,int): family,addr = socket.AF_INET,(host or socket.gethostname(),port)
     else: family,addr = socket.AF_UNIX,port
     return family,addr,(socket.SOCK_STREAM,socket.SOCK_DGRAM)[dgram]
 
-# %% ../nbs/03b_net.ipynb 39
+# %% ../nbs/03b_net.ipynb 38
 def start_server(port, host=None, dgram=False, reuse_addr=True, n_queue=None):
     "Create a `socket` server on `port`, with optional `host`, of type `dgram`"
     listen_args = [n_queue] if n_queue else []
@@ -239,7 +243,7 @@ def start_server(port, host=None, dgram=False, reuse_addr=True, n_queue=None):
     s.listen(*listen_args)
     return s
 
-# %% ../nbs/03b_net.ipynb 41
+# %% ../nbs/03b_net.ipynb 40
 def start_client(port, host=None, dgram=False):
     "Create a `socket` client on `port`, with optional `host`, of type `dgram`"
     family,addr,typ = _socket_det(port,host,dgram)

nbs/03b_net.ipynb

@@ -182,18 +182,21 @@
     {
      "data": {
       "text/markdown": [
-       "<h4 id=\"HTTP4xxClientError\" class=\"doc_header\"><code>class</code> <code>HTTP4xxClientError</code><a href=\"\" class=\"source_link\" style=\"float:right\">[source]</a></h4>\n",
+       "---\n",
        "\n",
-       "> <code>HTTP4xxClientError</code>(**`url`**, **`code`**, **`msg`**, **`hdrs`**, **`fp`**) :: `HTTPError`\n",
+       "### HTTP4xxClientError\n",
+       "\n",
+       ">      HTTP4xxClientError (url, code, msg, hdrs, fp)\n",
        "\n",
        "Base class for client exceptions (code 4xx) from `url*` functions"
       ],
       "text/plain": [
-       "<IPython.core.display.Markdown object>"
+       "<nbdev.showdoc.BasicMarkdownRenderer at 0x11baaacd0>"
       ]
      },
+     "execution_count": null,
      "metadata": {},
-     "output_type": "display_data"
+     "output_type": "execute_result"
     }
    ],
    "source": [
@@ -208,18 +211,21 @@
     {
      "data": {
       "text/markdown": [
-       "<h4 id=\"HTTP5xxServerError\" class=\"doc_header\"><code>class</code> <code>HTTP5xxServerError</code><a href=\"\" class=\"source_link\" style=\"float:right\">[source]</a></h4>\n",
+       "---\n",
        "\n",
-       "> <code>HTTP5xxServerError</code>(**`url`**, **`code`**, **`msg`**, **`hdrs`**, **`fp`**) :: `HTTPError`\n",
+       "### HTTP5xxServerError\n",
+       "\n",
+       ">      HTTP5xxServerError (url, code, msg, hdrs, fp)\n",
        "\n",
        "Base class for server exceptions (code 5xx) from `url*` functions"
       ],
       "text/plain": [
-       "<IPython.core.display.Markdown object>"
+       "<nbdev.showdoc.BasicMarkdownRenderer at 0x11bac3400>"
       ]
      },
+     "execution_count": null,
      "metadata": {},
-     "output_type": "display_data"
+     "output_type": "execute_result"
     }
    ],
    "source": [
@@ -233,9 +239,20 @@
    "outputs": [],
    "source": [
     "#|export\n",
-    "_opener = urllib.request.build_opener()\n",
-    "_opener.addheaders = list(url_default_headers.items())\n",
-    "install_opener(_opener)\n",
+    "def urlopener():\n",
+    "    _opener = urllib.request.build_opener()\n",
+    "    _opener.addheaders = list(url_default_headers.items())\n",
+    "    return _opener"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#|export\n",
+    "# install_opener(_opener)\n",
     "\n",
     "_httperrors = (\n",
     "    (400,'Bad Request'),(401,'Unauthorized'),(402,'Payment Required'),(403,'Forbidden'),(404,'Not Found'),\n",
@@ -276,7 +293,7 @@
     "    if data is not None:\n",
     "        if not isinstance(data, (str,bytes)): data = urlencode(data)\n",
     "        if not isinstance(data, bytes): data = data.encode('ascii')\n",
-    "    return _opener.open(urlwrap(url, data=data, headers=headers), timeout=timeout)"
+    "    return urlopener().open(urlwrap(url, data=data, headers=headers), timeout=timeout)"
    ]
   },
   {
@@ -551,36 +568,6 @@
     "    return urlread(req, return_json=return_json, return_headers=return_headers)"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Test [ghapi.actions.download_artifact](https://docs.github.com/rest/reference/actions#download-an-artifact)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "\n",
-    "url = \"https://github.com/fastai/ghapi/archive/refs/tags/0.1.15.zip\"\n",
-    "header={'Accept': 'application/vnd.github.v3+json'}\n",
-    "route={'artifact_id': 1234, 'archive_format': 'zip'} \n",
-    "\n",
-    "res = urlsend(url, \"get\", headers=header, route=route)\n",
-    "assert type(res) is bytes\n",
-    "\n",
-    "def _org_urlsend(url, verb, headers=None, route=None, query=None, data=None, json_data=True,\n",
-    "            return_json=True, return_headers=False, debug=None):\n",
-    "    req = urlrequest(url, verb, headers, route=route, query=query, data=data, json_data=json_data)\n",
-    "    if debug: debug(req)\n",
-    "    return urlread(req, return_json=return_json, return_headers=return_headers)\n",
-    "\n",
-    "test_fail(_org_urlsend, args=dict(url=url, verb=\"get\", headers=header, route=route), msg=\"'utf-8' codec can't decode\")"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -665,30 +652,9 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Converted 00_test.ipynb.\n",
-      "Converted 01_basics.ipynb.\n",
-      "Converted 02_foundation.ipynb.\n",
-      "Converted 03_xtras.ipynb.\n",
-      "Converted 03a_parallel.ipynb.\n",
-      "Converted 03b_net.ipynb.\n",
-      "Converted 04_dispatch.ipynb.\n",
-      "Converted 05_transform.ipynb.\n",
-      "Converted 06_docments.ipynb.\n",
-      "Converted 07_meta.ipynb.\n",
-      "Converted 08_script.ipynb.\n",
-      "Converted index.ipynb.\n",
-      "Converted parallel_win.ipynb.\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "#|hide\n",
-    "#|eval: false\n",
     "from nbdev import nbdev_export\n",
     "nbdev_export()"
    ]

settings.ini

@@ -7,7 +7,7 @@ author = Jeremy Howard and Sylvain Gugger
 author_email = [email protected]
 copyright = fast.ai
 branch = master
-version = 1.5.11
+version = 1.5.12
 min_python = 3.7
 audience = Developers
 language = English
@@ -23,3 +23,4 @@ title = fastcore
 doc_host = https://fastcore.fast.ai
 doc_baseurl = /
 host = github
+