fix pdb

Author: jph00

fastcore/_nbdev.py

@@ -75,6 +75,7 @@
          "true": "02_utils.ipynb",
          "gen": "02_utils.ipynb",
          "chunked": "02_utils.ipynb",
+         "otherwise": "02_utils.ipynb",
          "AttrDict": "02_utils.ipynb",
          "dict2obj": "02_utils.ipynb",
          "with_cast": "02_utils.ipynb",

fastcore/script.py

@@ -50,6 +50,7 @@ def anno_parser(func, prog=None, from_name=False):
 # Cell
 def args_from_prog(func, prog):
     "Extract args from `prog`"
+    if prog is None or '#' not in prog: return {}
     if '##' in prog: _,prog = prog.split('##', 1)
     progsp = prog.split("#")
     args = {progsp[i]:progsp[i+1] for i in range(0, len(progsp), 2)}
@@ -69,10 +70,10 @@ def _f(*args, **kwargs):
         mod = inspect.getmodule(inspect.currentframe().f_back)
         if not mod: return func(*args, **kwargs)
         p = anno_parser(func)
-        args = p.parse_args().__dict
-        if args.pop('pdb_debug', False): func = trace(func)
-        xtra = otherwise(args.pop('xtra', eq(1), p.prog))
-        func(**merge(args, args_from_prog(func, xtra)))
+        args = p.parse_args().__dict__
+        xtra = otherwise(args.pop('xtra', ''), eq(1), p.prog)
+        tfunc = trace(func) if args.pop('pdb', False) else func
+        tfunc(**merge(args, args_from_prog(func, xtra)))
 
     if mod.__name__=="__main__":
         setattr(mod, func.__name__, _f)

fastcore/utils.py

@@ -2,12 +2,12 @@
 
 __all__ = ['ifnone', 'maybe_attr', 'basic_repr', 'get_class', 'mk_class', 'wrap_class', 'ignore_exceptions',
            'exec_local', 'risinstance', 'Inf', 'in_', 'lt', 'gt', 'le', 'ge', 'eq', 'ne', 'add', 'sub', 'mul',
-           'truediv', 'is_', 'is_not', 'in_', 'true', 'gen', 'chunked', 'AttrDict', 'dict2obj', 'with_cast',
-           'store_attr', 'attrdict', 'properties', 'camel2snake', 'snake2camel', 'class2attr', 'hasattrs', 'setattrs',
-           'ShowPrint', 'Int', 'Str', 'Float', 'tuplify', 'detuplify', 'replicate', 'uniqueify', 'setify', 'merge',
-           'is_listy', 'range_of', 'groupby', 'last_index', 'shufflish', 'IterLen', 'ReindexCollection', 'num_methods',
-           'rnum_methods', 'inum_methods', 'fastuple', 'trace', 'compose', 'maps', 'partialler', 'mapped',
-           'instantiate', 'using_attr', 'Self', 'Self', 'open_file', 'save_pickle', 'load_pickle', 'bunzip',
+           'truediv', 'is_', 'is_not', 'in_', 'true', 'gen', 'chunked', 'otherwise', 'AttrDict', 'dict2obj',
+           'with_cast', 'store_attr', 'attrdict', 'properties', 'camel2snake', 'snake2camel', 'class2attr', 'hasattrs',
+           'setattrs', 'ShowPrint', 'Int', 'Str', 'Float', 'tuplify', 'detuplify', 'replicate', 'uniqueify', 'setify',
+           'merge', 'is_listy', 'range_of', 'groupby', 'last_index', 'shufflish', 'IterLen', 'ReindexCollection',
+           'num_methods', 'rnum_methods', 'inum_methods', 'fastuple', 'trace', 'compose', 'maps', 'partialler',
+           'mapped', 'instantiate', 'using_attr', 'Self', 'Self', 'open_file', 'save_pickle', 'load_pickle', 'bunzip',
            'join_path_file', 'urlread', 'urljson', 'run', 'do_request', 'sort_by_run', 'PrettyString', 'round_multiple',
            'even_mults', 'num_cpus', 'add_props', 'ContextManagers', 'typed', 'set_num_threads', 'ProcessPoolExecutor',
            'ThreadPoolExecutor', 'parallel', 'run_procs', 'parallel_gen', 'threaded']
@@ -166,6 +166,11 @@ def chunked(it, chunk_sz=None, drop_last=False, n_chunks=None):
         if res and (len(res)==chunk_sz or not drop_last): yield res
         if len(res)<chunk_sz: return
 
+# Cell
+def otherwise(x, tst, y):
+    "`y if tst(x) else x`"
+    return y if tst(x) else x
+
 # Cell
 class AttrDict(dict):
     "`dict` subclass that also provides access to keys as attrs"

nbs/02_utils.ipynb

@@ -852,6 +852,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "#export\n",
     "def otherwise(x, tst, y):\n",
     "    \"`y if tst(x) else x`\"\n",
     "    return y if tst(x) else x"

nbs/07_script.ipynb

@@ -280,6 +280,7 @@
     "#export\n",
     "def args_from_prog(func, prog):\n",
     "    \"Extract args from `prog`\"\n",
+    "    if prog is None or '#' not in prog: return {}\n",
     "    if '##' in prog: _,prog = prog.split('##', 1)\n",
     "    progsp = prog.split(\"#\")\n",
     "    args = {progsp[i]:progsp[i+1] for i in range(0, len(progsp), 2)}\n",
@@ -324,10 +325,10 @@
     "        mod = inspect.getmodule(inspect.currentframe().f_back)\n",
     "        if not mod: return func(*args, **kwargs)\n",
     "        p = anno_parser(func)\n",
-    "        args = p.parse_args().__dict\n",
-    "        if args.pop('pdb_debug', False): func = trace(func)\n",
-    "        xtra = otherwise(args.pop('xtra', eq(1), p.prog))\n",
-    "        func(**merge(args, args_from_prog(func, xtra)))\n",
+    "        args = p.parse_args().__dict__\n",
+    "        xtra = otherwise(args.pop('xtra', ''), eq(1), p.prog)\n",
+    "        tfunc = trace(func) if args.pop('pdb', False) else func\n",
+    "        tfunc(**merge(args, args_from_prog(func, xtra)))\n",
     "\n",
     "    if mod.__name__==\"__main__\":\n",
     "        setattr(mod, func.__name__, _f)\n",