diff --git a/fastcore/net.py b/fastcore/net.py index f523182b..15578974 100644 --- a/fastcore/net.py +++ b/fastcore/net.py @@ -46,7 +46,9 @@ def urlquote(url): # Cell def urlwrap(url, data=None, headers=None): "Wrap `url` in a urllib `Request` with `urlquote`" - return url if isinstance(url,Request) else Request(urlquote(url), data=data, headers=headers or {}) + headers=headers or {} + headers['User-agent'] = _ua + return url if isinstance(url,Request) else Request(urlquote(url), data=data, headers=headers) # Cell ExceptionsHTTP = {} @@ -62,8 +64,8 @@ class HTTP5xxServerError(HTTPError): pass # Cell -_opener = urllib.request.build_opener() -_opener.addheaders = [('User-agent', _ua)] +# _opener = urllib.request.build_opener() +# _opener.addheaders = [('User-agent', _ua)] _httperrors = ( (400,'Bad Request'),(401,'Unauthorized'),(402,'Payment Required'),(403,'Forbidden'),(404,'Not Found'), @@ -90,7 +92,7 @@ def urlopen(url, data=None, headers=None, **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)) + return urllib.request.urlopen(urlwrap(url, data=data, headers=headers)) # Cell def urlread(url, data=None, headers=None, **kwargs): diff --git a/nbs/03_xtras.ipynb b/nbs/03_xtras.ipynb index 874d1bb8..147f1918 100644 --- a/nbs/03_xtras.ipynb +++ b/nbs/03_xtras.ipynb @@ -1608,7 +1608,7 @@ "Converted 01_basics.ipynb.\n", "Converted 02_foundation.ipynb.\n", "Converted 03_xtras.ipynb.\n", - "Converted 03a.ipynb.\n", + "Converted 03a_parallel.ipynb.\n", "Converted 03b_net.ipynb.\n", "Converted 04_dispatch.ipynb.\n", "Converted 05_transform.ipynb.\n", diff --git a/nbs/03b_net.ipynb b/nbs/03b_net.ipynb index d0335317..359a34ad 100644 --- a/nbs/03b_net.ipynb +++ b/nbs/03b_net.ipynb @@ -129,7 +129,9 @@ "#export\n", "def urlwrap(url, data=None, headers=None):\n", " \"Wrap `url` in a urllib `Request` with `urlquote`\"\n", - " return url if isinstance(url,Request) else Request(urlquote(url), data=data, headers=headers or {})" + " headers=headers or {}\n", + " headers['User-agent'] = _ua\n", + " return url if isinstance(url,Request) else Request(urlquote(url), data=data, headers=headers)" ] }, { @@ -225,8 +227,8 @@ "outputs": [], "source": [ "#export\n", - "_opener = urllib.request.build_opener()\n", - "_opener.addheaders = [('User-agent', _ua)]\n", + "# _opener = urllib.request.build_opener()\n", + "# _opener.addheaders = [('User-agent', _ua)]\n", "\n", "_httperrors = (\n", " (400,'Bad Request'),(401,'Unauthorized'),(402,'Payment Required'),(403,'Forbidden'),(404,'Not Found'),\n", @@ -267,7 +269,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))" + " return urllib.request.urlopen(urlwrap(url, data=data, headers=headers))" ] }, {