Skip to content

Commit fded90c

Browse files
committed
fixes #237
1 parent 17eb005 commit fded90c

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

fastcore/net.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ def urlquote(url):
4646
# Cell
4747
def urlwrap(url, data=None, headers=None):
4848
"Wrap `url` in a urllib `Request` with `urlquote`"
49-
return url if isinstance(url,Request) else Request(urlquote(url), data=data, headers=headers or {})
49+
headers=headers or {}
50+
headers['User-agent'] = _ua
51+
return url if isinstance(url,Request) else Request(urlquote(url), data=data, headers=headers)
5052

5153
# Cell
5254
ExceptionsHTTP = {}
@@ -62,8 +64,8 @@ class HTTP5xxServerError(HTTPError):
6264
pass
6365

6466
# Cell
65-
_opener = urllib.request.build_opener()
66-
_opener.addheaders = [('User-agent', _ua)]
67+
# _opener = urllib.request.build_opener()
68+
# _opener.addheaders = [('User-agent', _ua)]
6769

6870
_httperrors = (
6971
(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):
9092
if data is not None:
9193
if not isinstance(data, (str,bytes)): data = urlencode(data)
9294
if not isinstance(data, bytes): data = data.encode('ascii')
93-
return _opener.open(urlwrap(url, data=data, headers=headers))
95+
return urllib.request.urlopen(urlwrap(url, data=data, headers=headers))
9496

9597
# Cell
9698
def urlread(url, data=None, headers=None, **kwargs):

nbs/03_xtras.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1608,7 +1608,7 @@
16081608
"Converted 01_basics.ipynb.\n",
16091609
"Converted 02_foundation.ipynb.\n",
16101610
"Converted 03_xtras.ipynb.\n",
1611-
"Converted 03a.ipynb.\n",
1611+
"Converted 03a_parallel.ipynb.\n",
16121612
"Converted 03b_net.ipynb.\n",
16131613
"Converted 04_dispatch.ipynb.\n",
16141614
"Converted 05_transform.ipynb.\n",

nbs/03b_net.ipynb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,9 @@
129129
"#export\n",
130130
"def urlwrap(url, data=None, headers=None):\n",
131131
" \"Wrap `url` in a urllib `Request` with `urlquote`\"\n",
132-
" return url if isinstance(url,Request) else Request(urlquote(url), data=data, headers=headers or {})"
132+
" headers=headers or {}\n",
133+
" headers['User-agent'] = _ua\n",
134+
" return url if isinstance(url,Request) else Request(urlquote(url), data=data, headers=headers)"
133135
]
134136
},
135137
{
@@ -225,8 +227,8 @@
225227
"outputs": [],
226228
"source": [
227229
"#export\n",
228-
"_opener = urllib.request.build_opener()\n",
229-
"_opener.addheaders = [('User-agent', _ua)]\n",
230+
"# _opener = urllib.request.build_opener()\n",
231+
"# _opener.addheaders = [('User-agent', _ua)]\n",
230232
"\n",
231233
"_httperrors = (\n",
232234
" (400,'Bad Request'),(401,'Unauthorized'),(402,'Payment Required'),(403,'Forbidden'),(404,'Not Found'),\n",
@@ -267,7 +269,7 @@
267269
" if data is not None:\n",
268270
" if not isinstance(data, (str,bytes)): data = urlencode(data)\n",
269271
" if not isinstance(data, bytes): data = data.encode('ascii')\n",
270-
" return _opener.open(urlwrap(url, data=data, headers=headers))"
272+
" return urllib.request.urlopen(urlwrap(url, data=data, headers=headers))"
271273
]
272274
},
273275
{

0 commit comments

Comments
 (0)