fastcore 2.0.4__tar.gz → 2.0.6__tar.gz

{fastcore-2.0.4/fastcore.egg-info → fastcore-2.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcore
-Version: 2.0.4
+Version: 2.0.6
 Summary: Python supercharged for fastai development
 Author-email: Jeremy Howard and Sylvain Gugger <infos@fast.ai>
 License: Apache-2.0

fastcore-2.0.6/fastcore/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.0.6"

{fastcore-2.0.4 → fastcore-2.0.6}/fastcore/_modidx.py

@@ -505,14 +505,12 @@ d = { 'settings': { 'branch': 'main',
                                'fastcore.nbio._is_json_mime': ('nbio.html#_is_json_mime', 'fastcore/nbio.py'),
                                'fastcore.nbio._join': ('nbio.html#_join', 'fastcore/nbio.py'),
                                'fastcore.nbio._mkout': ('nbio.html#_mkout', 'fastcore/nbio.py'),
-                               'fastcore.nbio._preferred_msg_out': ('nbio.html#_preferred_msg_out', 'fastcore/nbio.py'),
                                'fastcore.nbio._read_json': ('nbio.html#_read_json', 'fastcore/nbio.py'),
                                'fastcore.nbio._rejoin_cell': ('nbio.html#_rejoin_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio._rejoin_mime': ('nbio.html#_rejoin_mime', 'fastcore/nbio.py'),
                                'fastcore.nbio._render_text': ('nbio.html#_render_text', 'fastcore/nbio.py'),
                                'fastcore.nbio._split_cell': ('nbio.html#_split_cell', 'fastcore/nbio.py'),
                                'fastcore.nbio._split_mime': ('nbio.html#_split_mime', 'fastcore/nbio.py'),
-                               'fastcore.nbio.apply_controls': ('nbio.html#apply_controls', 'fastcore/nbio.py'),
                                'fastcore.nbio.cell2xml': ('nbio.html#cell2xml', 'fastcore/nbio.py'),
                                'fastcore.nbio.cells2xml': ('nbio.html#cells2xml', 'fastcore/nbio.py'),
                                'fastcore.nbio.concat_streams': ('nbio.html#concat_streams', 'fastcore/nbio.py'),
@@ -525,6 +523,7 @@ d = { 'settings': { 'branch': 'main',
                                'fastcore.nbio.nb2dict': ('nbio.html#nb2dict', 'fastcore/nbio.py'),
                                'fastcore.nbio.nb2str': ('nbio.html#nb2str', 'fastcore/nbio.py'),
                                'fastcore.nbio.new_nb': ('nbio.html#new_nb', 'fastcore/nbio.py'),
+                               'fastcore.nbio.preferred_msg_out': ('nbio.html#preferred_msg_out', 'fastcore/nbio.py'),
                                'fastcore.nbio.preferred_out': ('nbio.html#preferred_out', 'fastcore/nbio.py'),
                                'fastcore.nbio.read_nb': ('nbio.html#read_nb', 'fastcore/nbio.py'),
                                'fastcore.nbio.render_output': ('nbio.html#render_output', 'fastcore/nbio.py'),

{fastcore-2.0.4 → fastcore-2.0.6}/fastcore/docments.py

@@ -57,7 +57,10 @@ def get_source(s):
 # %% ../nbs/04_docments.ipynb #91c0d15f
 def _parses(s):
     "Parse source of function, method, or dataclass `s`"
-    return parse(dedent(get_source(s) or ''))
+    try: return parse(dedent(get_source(s) or ''))
+    except SyntaxError:
+        if isinstance(s,str): raise
+        return parse('')   # live object whose file changed on disk since import: degrade to no docments
 
 def _tokens(s):
     "Tokenize Python code in string or function object `s`"

{fastcore-2.0.4 → fastcore-2.0.6}/fastcore/nbio.py

@@ -5,15 +5,16 @@ Docs: https://fastcore.fast.ai/nbio.html.md"""
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/13_nbio.ipynb.
 
 # %% auto #0
-__all__ = ['NbCell', 'dict2nb', 'read_nb', 'mk_cell', 'new_nb', 'nb2dict', 'nb2str', 'write_nb', 'preferred_out',
-           'apply_controls', 'mk_stream', 'mk_result', 'mk_display', 'mk_error', 'concat_streams', 'render_output',
+__all__ = ['NbCell', 'dict2nb', 'read_nb', 'mk_cell', 'new_nb', 'nb2dict', 'nb2str', 'write_nb', 'preferred_out', 'mk_stream',
+           'mk_result', 'mk_display', 'mk_error', 'concat_streams', 'preferred_msg_out', 'render_output',
            'render_outputs', 'render_text', 'cell2xml', 'cells2xml', 'Notebook']
 
 # %% ../nbs/13_nbio.ipynb #954ca1aa
 from .basics import *
-from .xtras import rtoken_hex
+from .xtras import rtoken_hex,clean_cli_output
 from .imports import *
 from .ansi import ansi2html
+from .meta import delegates
 
 import ast,functools
 from pprint import pformat,pprint
@@ -159,16 +160,6 @@ def preferred_out(data, html1st=True, include_imgs=False):
         if (text := data.get(mt)): return mt,text
     return 'text/plain',''
 
-# %% ../nbs/13_nbio.ipynb #efec6078
-def apply_controls(text):
-    r"Apply \r and \b to text, returning processed result"
-    lines = text.split('\n')
-    for i, line in enumerate(lines):
-        if 0<(rpos := line.rfind('\r'))<len(line)-1: lines[i] = line[rpos+1:]
-    text = '\n'.join(lines)
-    while (pos := text.find('\b')) >= 0: text = text[:max(0, pos-1)] + text[pos+1:]
-    return text
-
 # %% ../nbs/13_nbio.ipynb #24a47a87
 def _join(d): return ''.join(d) if isinstance(d, list) else d
 
@@ -198,17 +189,19 @@ def concat_streams(outputs):
     streams, res, execute_results = {}, [], []
     for out in outputs:
         if out['output_type'] == 'stream':
-            name, text = out['name'], _join(out['text'])
-            streams[name] = apply_controls(streams.get(name, '') + text)
+            name = out['name']
+            streams[name] = streams.get(name, '') + _join(out['text'])
         elif out['output_type'] in ('error','execute_result'): execute_results.append(out)
         else: res.append(out)
-    if 'stdout' in streams: res.append(mk_stream('stdout', streams['stdout']))
-    if 'stderr' in streams: res.append(mk_stream('stderr', streams['stderr']))
+    for name in ('stdout','stderr'):
+        if name in streams: res.append(mk_stream(name, clean_cli_output(streams[name], strip=False)))
     res.extend(execute_results)
     return res
 
 # %% ../nbs/13_nbio.ipynb #a3deacac
-def _preferred_msg_out(out, **kwargs):
+@delegates(preferred_out)
+def preferred_msg_out(out, **kwargs):
+    "Preferred mime type and content for any Jupyter output dict (stream, error, or data-bearing)"
     typ = out['output_type']
     if typ == 'stream': return 'text/plain', _join(out.get('text', ""))
     elif typ == 'error': return 'text/plain', '\n'.join(out.get('traceback', []))
@@ -221,7 +214,7 @@ def render_output(out):
     def _fmt(text):
         res = ansi2html(str(text))
         return f'<pre class="!border-0 !rounded-none !my-0 !p-0"><code class="nohighlight">{res}</code></pre>'
-    ptyp,d = _preferred_msg_out(out, html1st=True, include_imgs=True)
+    ptyp,d = preferred_msg_out(out, html1st=True, include_imgs=True)
     d = _join(d)
     if   ptyp=='text/plain': return _fmt(d)
     elif ptyp=='text/html': return d
@@ -242,7 +235,7 @@ def render_outputs(outputs):
 # %% ../nbs/13_nbio.ipynb #88b0018a
 def _render_text(out, html1st=False):
     typ = out['output_type']
-    mime,d = _preferred_msg_out(out, html1st=html1st, include_imgs=False)
+    mime,d = preferred_msg_out(out, html1st=html1st, include_imgs=False)
     d = _join(d)
     if not d: return None
     attrs = {}

{fastcore-2.0.4 → fastcore-2.0.6}/fastcore/xtras.py

@@ -713,12 +713,16 @@ def frontmatter(txt:str)->tuple:
 
 # %% ../nbs/03_xtras.ipynb #45eb5141
 def clean_cli_output(txt:str, strip:bool=True):
-    "Clean CLI output by handling alternate screen, carriage returns, and ANSI escapes"
+    r"Render CLI output as it appears on screen: alternate screen, `\r` overwrites, `\b` backspaces, and ANSI escapes"
     if '\x1b[?1049h' in txt:
         if '\x1b[?1049l' not in txt: return ''
         txt = txt.rsplit('\x1b[?1049l', 1)[-1]
     txt = txt.replace('\r\n', '\n')
-    res = '\n'.join(l.rsplit('\r', 1)[-1] for l in txt.split('\n'))
+    def _line(l):
+        l = l.rstrip('\r').rsplit('\r', 1)[-1]  # trailing \r overwrites nothing; else keep last overwrite
+        while (i := l.find('\b')) != -1: l = l[:i] if i==len(l)-1 else l[:max(0,i-1)] + l[i+1:]
+        return l
+    res = '\n'.join(_line(l) for l in txt.split('\n'))
     return strip_ansi(res, term_queries=True) if strip else res
 
 # %% ../nbs/03_xtras.ipynb #35368de5

{fastcore-2.0.4 → fastcore-2.0.6/fastcore.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcore
-Version: 2.0.4
+Version: 2.0.6
 Summary: Python supercharged for fastai development
 Author-email: Jeremy Howard and Sylvain Gugger <infos@fast.ai>
 License: Apache-2.0

fastcore-2.0.4/fastcore/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.0.4"