fixes #218

Author: jph00

fastcore/_nbdev.py

@@ -162,6 +162,7 @@
          "run": "03_xtras.ipynb",
          "do_request": "03_xtras.ipynb",
          "threaded": "03_xtras.ipynb",
+         "startthread": "03_xtras.ipynb",
          "start_server": "03_xtras.ipynb",
          "start_client": "03_xtras.ipynb",
          "sort_by_run": "03_xtras.ipynb",

fastcore/script.py

@@ -95,6 +95,7 @@ def _f(*args, **kwargs):
         mod = inspect.getmodule(inspect.currentframe().f_back)
         if not mod: return func(*args, **kwargs)
         if not SCRIPT_INFO.func and mod.__name__=="__main__": SCRIPT_INFO.func = func.__name__
+        if len(sys.argv)>1 and sys.argv[1]=='': sys.argv.pop(1)
         p = anno_parser(func)
         args = p.parse_args().__dict__
         xtra = otherwise(args.pop('xtra', ''), eq(1), p.prog)

fastcore/xtras.py

@@ -3,8 +3,8 @@
 __all__ = ['dict2obj', 'repr_dict', 'is_listy', 'shufflish', 'mapped', 'IterLen', 'ReindexCollection', 'open_file',
            'save_pickle', 'load_pickle', 'maybe_open', 'image_size', 'bunzip', 'join_path_file', 'urlquote', 'urlwrap',
            'urlopen', 'urlread', 'urljson', 'urlcheck', 'urlclean', 'urlsave', 'urlvalid', 'untar_dir', 'repo_details',
-           'run', 'do_request', 'threaded', 'start_server', 'start_client', 'sort_by_run', 'trace', 'round_multiple',
-           'modified_env', 'ContextManagers', 'str2bool', 'set_num_threads', 'ProcessPoolExecutor',
+           'run', 'do_request', 'threaded', 'startthread', 'start_server', 'start_client', 'sort_by_run', 'trace',
+           'round_multiple', 'modified_env', 'ContextManagers', 'str2bool', 'set_num_threads', 'ProcessPoolExecutor',
            'ThreadPoolExecutor', 'parallel', 'run_procs', 'parallel_gen']
 
 # Cell
@@ -193,25 +193,25 @@ def urlquote(url):
     return urlunparse(p)
 
 # Cell
-def urlwrap(url):
+def urlwrap(url, data=None, headers=None):
     "Wrap `url` in a urllib `Request` with a user-agent header"
-    if not isinstance(url,Request): url = Request(urlquote(url))
+    if not isinstance(url,Request): url = Request(urlquote(url), data=data, headers=headers or {})
     url.headers['User-Agent'] = _ua
     return url
 
 # Cell
-def urlopen(url, data=None, **kwargs):
+def urlopen(url, data=None, headers=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 urllib.request.urlopen(urlwrap(url))
+    return urllib.request.urlopen(urlwrap(url, data=data, headers=headers))
 
 # Cell
-def urlread(url, data=None, **kwargs):
+def urlread(url, data=None, headers=None, **kwargs):
     "Retrieve `url`, using `data` dict or `kwargs` to `POST` if present"
-    with urlopen(url, data=data) as res: return res.read()
+    with urlopen(url, data=data, headers=headers, **kwargs) as res: return res.read()
 
 # Cell
 def urljson(url, data=None):
@@ -292,6 +292,11 @@ def _f(*args, **kwargs):
         return res
     return _f
 
+# Cell
+def startthread(f):
+    "Like `threaded`, but start thread immediately"
+    threaded(f)()
+
 # Cell
 def _socket_det(port,host,dgram):
     if isinstance(port,int): family,addr = socket.AF_INET,(host or socket.gethostname(),port)

nbs/03_xtras.ipynb

@@ -588,7 +588,7 @@
     {
      "data": {
       "text/plain": [
-       "['h', 'e', 'f', 'b', 'c', 'a', 'g', 'd']"
+       "['c', 'h', 'f', 'e', 'g', 'b', 'd', 'a']"
       ]
      },
      "execution_count": null,
@@ -1222,9 +1222,9 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "def urlwrap(url):\n",
+    "def urlwrap(url, data=None, headers=None):\n",
     "    \"Wrap `url` in a urllib `Request` with a user-agent header\"\n",
-    "    if not isinstance(url,Request): url = Request(urlquote(url))\n",
+    "    if not isinstance(url,Request): url = Request(urlquote(url), data=data, headers=headers or {})\n",
     "    url.headers['User-Agent'] = _ua\n",
     "    return url"
    ]
@@ -1236,13 +1236,44 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "def urlopen(url, data=None, **kwargs):\n",
+    "def urlopen(url, data=None, headers=None, **kwargs):\n",
     "    \"Like `urllib.request.urlopen`, but first `urlwrap` the `url`, and encode `data`\"\n",
     "    if kwargs and not data: data=kwargs\n",
     "    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 urllib.request.urlopen(urlwrap(url))"
+    "    return urllib.request.urlopen(urlwrap(url, data=data, headers=headers))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "u = urlwrap('http://localhost:6065/setup.py?a=1', data=urlencode({'foo':'bar'}), headers={'Content-Type':'application/json'})"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "[('Content-type', 'application/json'),\n",
+       " ('User-Agent',\n",
+       "  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36')]"
+      ]
+     },
+     "execution_count": null,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "u.header_items()"
    ]
   },
   {
@@ -1252,9 +1283,9 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "def urlread(url, data=None, **kwargs):\n",
+    "def urlread(url, data=None, headers=None, **kwargs):\n",
     "    \"Retrieve `url`, using `data` dict or `kwargs` to `POST` if present\"\n",
-    "    with urlopen(url, data=data) as res: return res.read()"
+    "    with urlopen(url, data=data, headers=headers, **kwargs) as res: return res.read()"
    ]
   },
   {
@@ -1486,6 +1517,18 @@
     "    return _f"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#export\n",
+    "def startthread(f):\n",
+    "    \"Like `threaded`, but start thread immediately\"\n",
+    "    threaded(f)()"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -1563,13 +1606,12 @@
     }
    ],
    "source": [
-    "@threaded\n",
+    "@startthread\n",
     "def _f():\n",
     "    with start_server(47354, 'localhost') as s:\n",
     "        conn,addr = s.accept()\n",
     "        print(conn.recv(1024))\n",
     "\n",
-    "_f()\n",
     "time.sleep(0.2) # Wait for server to start\n",
     "with start_client(47354, 'localhost') as c: c.send(b\"hello\")"
    ]

nbs/08_script.ipynb

@@ -291,9 +291,21 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Help on function f in module __main__:\n",
+      "\n",
+      "f(required: int <Required param>, a: bool_arg <param 1>, b: str <param 2> = 'test')\n",
+      "    my docs\n",
+      "\n"
+     ]
+    }
+   ],
    "source": [
-    "f?"
+    "help(f)"
    ]
   },
   {
@@ -433,6 +445,7 @@
     "        mod = inspect.getmodule(inspect.currentframe().f_back)\n",
     "        if not mod: return func(*args, **kwargs)\n",
     "        if not SCRIPT_INFO.func and mod.__name__==\"__main__\": SCRIPT_INFO.func = func.__name__\n",
+    "        if len(sys.argv)>1 and sys.argv[1]=='': sys.argv.pop(1)\n",
     "        p = anno_parser(func)\n",
     "        args = p.parse_args().__dict__\n",
     "        xtra = otherwise(args.pop('xtra', ''), eq(1), p.prog)\n",
@@ -501,7 +514,6 @@
       "Converted 03_xtras.ipynb.\n",
       "Converted 04_dispatch.ipynb.\n",
       "Converted 05_transform.ipynb.\n",
-      "Converted 06_logargs.ipynb.\n",
       "Converted 07_meta.ipynb.\n",
       "Converted 08_script.ipynb.\n",
       "Converted index.ipynb.\n"