visidata 3.1__py3-none-any.whl → 3.2__py3-none-any.whl

visidata/clipboard.py

@@ -7,13 +7,21 @@ import tempfile
 import functools
 import os
 import itertools
+import platform
 
 from visidata import VisiData, vd, asyncthread, SettableColumn
 from visidata import Sheet, Path, Column
 
-if sys.platform == 'win32':
+if (
+    # Windows
+    sys.platform == 'win32'
+    # WSL 2
+    or "microsoft-standard-WSL2" in platform.uname().release
+    # WSL 1
+    or sys.platform == 'linux' and platform.uname().release.endswith("-Microsoft")
+):
     syscopy_cmd_default = 'clip.exe'
-    syspaste_cmd_default = 'powershell -command Get-Clipboard'
+    syspaste_cmd_default = 'powershell.exe -noprofile -command Get-Clipboard'
 elif sys.platform == 'darwin':
     syscopy_cmd_default = 'pbcopy w'
     syspaste_cmd_default = 'pbpaste'
@@ -196,6 +204,7 @@ Sheet.addCommand('Y', 'syscopy-row', 'syscopyCells(visibleCols, [cursorRow])', '
 
 Sheet.addCommand('gY', 'syscopy-selected', 'syscopyCells(visibleCols, onlySelectedRows)', 'yank (copy) selected rows to system clipboard (using options.clipboard_copy_cmd)')
 Sheet.addCommand('zY', 'syscopy-cell', 'syscopyValue(cursorDisplay)', 'yank (copy) current cell to system clipboard (using options.clipboard_copy_cmd)')
+Sheet.addCommand('', 'syscopy-colname', 'syscopyValue(cursorCol.name)', 'yank (copy) current column header to system clipboard (using options.clipboard_copy_cmd)')
 Sheet.addCommand('gzY', 'syscopy-cells', 'syscopyCells([cursorCol], onlySelectedRows, filetype="txt")', 'yank (copy) contents of current column from selected rows to system clipboard (using options.clipboard_copy_cmd')
 
 Sheet.addCommand('x', 'cut-row', 'copyRows([sheet.delete_row(cursorRowIndex)]); defer and cursorDown(1)', 'delete (cut) current row and move it to clipboard')

visidata/cliptext.py

@@ -142,42 +142,52 @@ def iterchars(x):
 
 @functools.lru_cache(maxsize=100000)
 def _clipstr(s, dispw, trunch='', oddspacech='', combch='', modch=''):
-    '''Return clipped string and width in terminal display characters.
-    Note: width may differ from len(s) if East Asian chars are 'fullwidth'.'''
-    if not s:
+    ''' *s* is a string or an iterator that contains characters.
+    *dispw* is the integer screen width that the clipped string will fit inside, or None.
+    Return clipped string and width in terminal display characters.
+    Note: width may differ from len(s) if chars are 'fullwidth'.
+    If *dispw* is None, no clipping occurs.
+    If *trunch* has a width greater than *dispw*, the empty string
+    will be used as a truncator instead.'''
+    if not s or (dispw is not None and dispw < 1): #iterator s would be truthy
         return '', 0
 
-    if dispw == 1:
-        return s[0], 1
-
     w = 0
     ret = ''
+    trunc_i = 0
+    w_truncated = 0
 
     trunchlen = dispwidth(trunch)
+    if dispw is None:
+        s = ''.join(s)
+        return s, dispwidth(s)
+    if trunchlen > dispw: #if the truncator cannot fit, use a truncator of ''
+        return _clipstr(s, dispw, trunch='', oddspacech=oddspacech, combch=combch, modch=modch)
     for c in s:
         newc, chlen = _dispch(c, oddspacech=oddspacech, combch=combch, modch=modch)
         if not newc:
             newc = c
             chlen = dispwidth(c)
 
-        if dispw and w+chlen > dispw:
-            if trunchlen and dispw > trunchlen:
-                lastchlen = _dispch(ret[-1])[1]
-                if w+trunchlen > dispw:
-                    ret = ret[:-1]
-                    w -= lastchlen
-                ret += trunch  # replace final char with ellipsis
-                w += trunchlen
-            break
-
-        w += chlen
-        ret += newc
+        #if the next character will fit
+        if w+chlen <= dispw:
+            ret += c
+            w += chlen
+            #move the truncation spot forward only when the truncation character can fit
+            if w+trunchlen <= dispw:
+                trunc_i += 1
+                w_truncated += chlen
+            continue
+        # if we reach this line, a character did not fit, and the result needs truncation
+        return ret[:trunc_i] + trunch, w_truncated+trunchlen
 
     return ret, w
 
 
 @drawcache
 def clipstr(s, dispw, truncator=None, oddspace=None):
+    ''' *s* is a string or an iterator that contains characters.
+    *dispw* is the integer screen width that the clipped string will fit inside, or None.'''
     if options.visibility:
         return _clipstr(s, dispw,
                         trunch=options.disp_truncator if truncator is None else truncator,
@@ -205,8 +215,6 @@ def clipdraw(scr, y, x, s, attr, w=None, clear=True, literal=False, **kwargs):
 
     x = max(0, x)
     y = max(0, y)
-    assert x >= 0, x
-    assert y >= 0, y
 
     return clipdraw_chunks(scr, y, x, chunks, attr, w=w, clear=clear, **kwargs)
 
@@ -310,6 +318,7 @@ def wraptext(text, width=80, indent=''):
         line = _markdown_to_internal(line)
         chunks = re.split(internal_markup_re, line)
         textchunks = [x for x in chunks if not is_vdcode(x)]
+        # textwrap.wrap does not handle variable-width characters  #2416
         for linenum, textline in enumerate(textwrap.wrap(''.join(textchunks), width=width, drop_whitespace=False)):
             txt = textline
             r = ''
@@ -345,8 +354,39 @@ def clipbox(scr, lines, attr, title=''):
     for i, line in enumerate(lines):
         clipdraw(scr, i+1, 2, line, attr)
 
-    clipdraw(scr, 0, w-len(title)-6, f"| {title} |", attr)
-
+    clipdraw(scr, 0, w-dispwidth(title)-6, f"| {title} |", attr)
+
+def clipstr_start(dispval, w, truncator=''):
+    '''Return a tuple (frag, dw), where *frag* is the longest ending substring
+    of *dispval* that will fit in a space *w* terminal display characters wide,
+    and *dw* is the substring's display width as an int.'''
+    # Note: this implementation is likely incorrect for unusual Unicode
+    # strings or encodings, where trimming an initial character produces
+    # an invalid string or does not make the string shorter.
+    if w <= 0: return '', 0
+    j = len(dispval)
+    while j >= 1:
+        if dispwidth((truncator if j > 1 else '') + dispval[j-1:]) <= w:
+            j -= 1
+        else:
+            break
+    frag = (truncator if j > 0 else '') + dispval[j:]
+    return frag, dispwidth(frag)
+
+def clipstr_middle(s, n=10, truncator='…'):
+    '''Return a string having a display width <= *n*. Excess characters are
+    trimmed from the middle of the string, and replaced by a single
+    instance of *truncator*.'''
+    if n == 0: return '', 0
+    if dispwidth(s) > n:
+        #for even widths, give the leftover 1 space to the right fragment
+        l_space = n//2 if n%2 == 1 else max(n//2-1, 0)
+        l_frag, l_w = _clipstr(s, l_space)
+        #if left fragment did not fill its space, give the unused space to the right fragment
+        r_frag = clipstr_start(s, n//2+(l_space-l_w))[0]
+        res = l_frag + truncator + r_frag
+        return res, dispwidth(res)
+    return s, dispwidth(s)
 
 vd.addGlobals(clipstr=clipstr,
               clipdraw=clipdraw,
@@ -355,4 +395,6 @@ vd.addGlobals(clipstr=clipstr,
               dispwidth=dispwidth,
               iterchars=iterchars,
               iterchunks=iterchunks,
-              wraptext=wraptext)
+              wraptext=wraptext,
+              clipstr_start=clipstr_start,
+              clipstr_middle=clipstr_middle)

visidata/cmdlog.py

@@ -330,6 +330,9 @@ def replay_sync(vd, cmdlog):
     with vd.DisableAsync():
         vd.sync()  #2352 let cmdlog finish loading
         cmdlog.cursorRowIndex = 0
+        # save current replay, for cmdlogs that replay other cmdlogs, such as a macro executing another macro
+        prev_replay = vd.currentReplay
+        prev_replay_row = vd.currentReplayRow
         vd.currentReplay = cmdlog
 
         with Progress(total=len(cmdlog.rows)) as prog:
@@ -356,7 +359,8 @@ def replay_sync(vd, cmdlog):
                     vd.activeSheet.ensureLoaded()
 
         vd.status('replay complete')
-        vd.currentReplay = None
+        vd.currentReplay = prev_replay
+        vd.currentReplayRow = prev_replay_row
 
 
 @VisiData.api

visidata/column.py

@@ -249,6 +249,8 @@ class Column(Extensible):
 
         if self.type is anytype:
             if isinstance(typedval, (dict, list, tuple)):
+                if width is None:
+                    return ''.join(iterchars(typedval))
                 dispval, dispw = clipstr(iterchars(typedval), width)
                 return dispval
 
@@ -264,7 +266,9 @@ class Column(Extensible):
 
            The 'generic' displayer does not do any formatting.
         '''
-        if width is not None and width > 1 and vd.isNumeric(self):
+        if width is not None and width > 1 and \
+                vd.isNumeric(self) and \
+                isinstance(dw.typedval, (int, float)):
             yield ('', dw.text.rjust(width-2))
         else:
             yield ('', dw.text)
@@ -470,7 +474,7 @@ class Column(Extensible):
                     break  #1747  early out to speed up wide columns
             w = w_max
         w = max(w, nlen)+2
-        w = min(w, self.sheet.windowWidth)
+        w = min(w, self.sheet.windowWidth-1)
         return w
 
 

visidata/ddwplay.py

@@ -1,7 +1,7 @@
 from collections import defaultdict
 import json
 import time
-from visidata import colors, vd, clipdraw, ColorAttr
+from visidata import colors, vd, clipdraw, ColorAttr, dispwidth
 
 __all__ = ['Animation', 'AnimationMgr']
 
@@ -77,7 +77,7 @@ class Animation:
             self.total_ms = sum(f.duration_ms or 0 for f in self.frames.values())
             for f in self.frames.values():
                 for r, x, y, _ in self.iterdeep(f.rows):
-                    self.width = max(self.width, x+len(r.text))
+                    self.width = max(self.width, x+dispwidth(r.text))
                     self.height = max(self.height, y)
 
     def draw(self, scr, *, t=0, x=0, y=0, loop=False, attr=ColorAttr(), **kwargs):

visidata/deprecated.py

@@ -3,12 +3,16 @@ import functools
 from visidata import VisiData, vd
 import visidata
 
-alias = visidata.BaseSheet.bindkey
+def deprecated_alias(depver, *args, **kwargs):
+    # expand this to create cmd
+    # with cmd.deprecated=depver
+    return visidata.BaseSheet.bindkey(*args, **kwargs)
 
-def deprecated_warn(func, ver, instead):
+@VisiData.api
+def deprecated_warn(vd, funcname, ver, instead):
     import traceback
 
-    msg = f'{func.__name__} deprecated since v{ver}'
+    msg = f'{funcname} deprecated since v{ver}'
     if instead:
         msg += f'; use {instead}'
 
@@ -20,18 +24,27 @@ def deprecated_warn(func, ver, instead):
         vd.warning(f'Deprecated call traceback (most recent last):')
 
 
-def deprecated(ver, instead=''):
+def deprecated(ver, instead='', check=True):
     def decorator(func):
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
-            deprecated_warn(func, ver, instead)
+            vd.deprecated_warn(wrapper.__name__, ver, instead)
             return func(*args, **kwargs)
+
+        if check and hasattr(func, '_extensible_api'):
+            vd.error(f"{func.__name__}: @deprecated applied in wrong order")  #2623
+
         return wrapper
     return decorator
 
 
-@deprecated('1.6', 'vd instead of vd()')
+def _deprecated_api(ver, instead=''):
+    'Decorator to deliberately wrap non-deprecated .api functions as a deprecated global function.  Use @deprecated instead, except in deprecated.py.'
+    return deprecated(ver, instead, check=False)
+
+
 @VisiData.api
+@deprecated('1.6', 'vd instead of vd()')
 def __call__(vd):
     'Deprecated; use plain "vd"'
     return vd
@@ -39,7 +52,7 @@ def __call__(vd):
 
 @deprecated('1.6')
 def copyToClipboard(value):
-    vd.error("copyToClipboard longer implemented")
+    vd.error("copyToClipboard no longer implemented")
     return visidata.clipboard_copy(value)
 
 
@@ -62,32 +75,32 @@ def bindkey_override(keystrokes, longname):
 bindkey = visidata.BaseSheet.bindkey
 unbindkey = visidata.BaseSheet.unbindkey
 
-@deprecated('2.0')
 @visidata.Sheet.api
+@deprecated('2.0')
 def exec_keystrokes(self, keystrokes, vdglobals=None):
     return self.execCommand(self.getCommand(keystrokes), vdglobals, keystrokes=keystrokes)
 
 visidata.Sheet.exec_command = deprecated('2.0')(visidata.Sheet.execCommand)
 
-@deprecated('2.0', 'def open_<filetype> instead')
 @VisiData.api
+@deprecated('2.0', 'def open_<filetype> instead')
 def filetype(vd, ext, constructor):
     'Add constructor to handle the given file type/extension.'
     globals().setdefault('open_'+ext, lambda p,ext=ext: constructor(p.base_stem, source=p, filetype=ext))
 
-@deprecated('2.0', 'Sheet(namepart1, namepart2, ...)')
 @VisiData.global_api
+@deprecated('2.0', 'Sheet(namepart1, namepart2, ...)')
 def joinSheetnames(vd, *sheetnames):
     'Concatenate sheet names in a standard way'
     return visidata.options.name_joiner.join(str(x) for x in sheetnames)
 
-@deprecated('2.0', 'PyobjSheet')
 @VisiData.global_api
+@deprecated('2.0', 'PyobjSheet')
 def load_pyobj(*names, **kwargs):
     return visidata.PyobjSheet(*names, **kwargs)
 
-@deprecated('2.0', 'PyobjSheet')
 @VisiData.global_api
+@deprecated('2.0', 'PyobjSheet')
 def push_pyobj(name, pyobj):
     vs = visidata.PyobjSheet(name, source=pyobj)
     if vs:
@@ -103,33 +116,33 @@ visidata.addGlobals({'load_pyobj': load_pyobj, 'isNumeric': isNumeric})
 
 # The longnames on the left are deprecated for 2.0
 
-alias('edit-cells', 'setcol-input')
-alias('fill-nulls', 'setcol-fill')
-alias('paste-cells', 'setcol-clipboard')
-alias('frequency-rows', 'frequency-summary')
-alias('dup-cell', 'dive-cell')
-alias('dup-row', 'dive-row')
-alias('next-search', 'search-next')
-alias('prev-search', 'search-prev')
-alias('search-prev', 'searchr-next')
-alias('prev-sheet', 'jump-prev')
-alias('prev-value', 'go-prev-value')
-alias('next-value', 'go-next-value')
-alias('prev-selected', 'go-prev-selected')
-alias('next-selected', 'go-next-selected')
-alias('prev-null', 'go-prev-null')
-alias('next-null', 'go-next-null')
-alias('page-right', 'go-right-page')
-alias('page-left', 'go-left-page')
-alias('dive-cell', 'open-cell')
-alias('dive-row', 'open-row')
-alias('add-sheet', 'open-new')
-alias('save-sheets-selected', 'save-selected')
-alias('join-sheets', 'join-selected')
-alias('dive-rows', 'dive-selected')
+deprecated_alias('2.0', 'edit-cells', 'setcol-input')
+deprecated_alias('2.0', 'fill-nulls', 'setcol-fill')
+deprecated_alias('2.0', 'paste-cells', 'setcol-clipboard')
+deprecated_alias('2.0', 'frequency-rows', 'frequency-summary')
+deprecated_alias('2.0', 'dup-cell', 'dive-cell')
+deprecated_alias('2.0', 'dup-row', 'dive-row')
+deprecated_alias('2.0', 'next-search', 'search-next')
+deprecated_alias('2.0', 'prev-search', 'search-prev')
+deprecated_alias('2.0', 'search-prev', 'searchr-next')
+deprecated_alias('2.0', 'prev-sheet', 'jump-prev')
+deprecated_alias('2.0', 'prev-value', 'go-prev-value')
+deprecated_alias('2.0', 'next-value', 'go-next-value')
+deprecated_alias('2.0', 'prev-selected', 'go-prev-selected')
+deprecated_alias('2.0', 'next-selected', 'go-next-selected')
+deprecated_alias('2.0', 'prev-null', 'go-prev-null')
+deprecated_alias('2.0', 'next-null', 'go-next-null')
+deprecated_alias('2.0', 'page-right', 'go-right-page')
+deprecated_alias('2.0', 'page-left', 'go-left-page')
+deprecated_alias('2.0', 'dive-cell', 'open-cell')
+deprecated_alias('2.0', 'dive-row', 'open-row')
+deprecated_alias('2.0', 'add-sheet', 'open-new')
+deprecated_alias('2.0', 'save-sheets-selected', 'save-selected')
+deprecated_alias('2.0', 'join-sheets', 'join-selected')
+deprecated_alias('2.0', 'dive-rows', 'dive-selected')
 
 # v2.3
-alias('show-aggregate', 'memo-aggregate')
+deprecated_alias('2.3', 'show-aggregate', 'memo-aggregate')
 #theme('use_default_colors', True, 'curses use default terminal colors')
 #option('expand_col_scanrows', 1000, 'number of rows to check when expanding columns (0 = all)')
 
@@ -149,25 +162,25 @@ def load_tsv(fn):
 
 # NOTE: you cannot use deprecated() with nonfuncs
 
-cancelThread = deprecated('2.6', 'vd.cancelThread')(vd.cancelThread)
-status = deprecated('2.6', 'vd.status')(vd.status)
-warning = deprecated('2.6', 'vd.warning')(vd.warning)
-error = deprecated('2.6', 'vd.error')(vd.error)
-debug = deprecated('2.6', 'vd.debug')(vd.debug)
-fail = deprecated('2.6', 'vd.fail')(vd.fail)
+cancelThread = _deprecated_api('2.6', 'vd.cancelThread')(vd.cancelThread)
+status = _deprecated_api('2.6', 'vd.status')(vd.status)
+warning = _deprecated_api('2.6', 'vd.warning')(vd.warning)
+error = _deprecated_api('2.6', 'vd.error')(vd.error)
+debug = _deprecated_api('2.6', 'vd.debug')(vd.debug)
+fail = _deprecated_api('2.6', 'vd.fail')(vd.fail)
 
 option = theme = vd.option # deprecated('2.6', 'vd.option')(vd.option)
 jointypes = vd.jointypes # deprecated('2.6', 'vd.jointypes')(vd.jointypes)
-confirm = deprecated('2.6', 'vd.confirm')(vd.confirm)
-launchExternalEditor = deprecated('2.6', 'vd.launchExternalEditor')(vd.launchExternalEditor)
-launchEditor = deprecated('2.6', 'vd.launchEditor')(vd.launchEditor)
-exceptionCaught = deprecated('2.6', 'vd.exceptionCaught')(vd.exceptionCaught)
-openSource = deprecated('2.6', 'vd.openSource')(vd.openSource)
+confirm = _deprecated_api('2.6', 'vd.confirm')(vd.confirm)
+launchExternalEditor = _deprecated_api('2.6', 'vd.launchExternalEditor')(vd.launchExternalEditor)
+launchEditor = _deprecated_api('2.6', 'vd.launchEditor')(vd.launchEditor)
+exceptionCaught = _deprecated_api('2.6', 'vd.exceptionCaught')(vd.exceptionCaught)
+openSource = _deprecated_api('2.6', 'vd.openSource')(vd.openSource)
 globalCommand = visidata.BaseSheet.addCommand
-visidata.Sheet.StaticColumn = deprecated('2.11', 'Sheet.freeze_col')(visidata.Sheet.freeze_col)
+visidata.Sheet.StaticColumn = _deprecated_api('2.11', 'Sheet.freeze_col')(visidata.Sheet.freeze_col)
 #visidata.Path.open_text = deprecated('3.0', 'visidata.Path.open')(visidata.Path.open)  # undeprecated in 3.1
 
-vd.sysclip_value = deprecated('3.0', 'vd.sysclipValue')(vd.sysclipValue)
+vd.sysclip_value = _deprecated_api('3.0', 'vd.sysclipValue')(vd.sysclipValue)
 
 def itemsetter(i):
     def g(obj, v):
@@ -181,8 +194,8 @@ vd.optalias('confirm_overwrite', 'overwrite', 'confirm')
 vd.optalias('show_graph_labels', 'disp_graph_labels')
 vd.optalias('zoom_incr', 'disp_zoom_incr')
 
-alias('visibility-sheet', 'toggle-multiline')
-alias('visibility-col', 'toggle-multiline')
+deprecated_alias('3.0', 'visibility-sheet', 'toggle-multiline')
+deprecated_alias('3.0', 'visibility-col', 'toggle-multiline')
 
 def clean_to_id(s):
     return visidata.vd.cleanName(s)
@@ -204,7 +217,7 @@ class OnExit:
         except Exception as e:
             vd.exceptionCaught(e)
 
-alias('open-inputs', 'open-input-history')
+deprecated_alias('3.0', 'open-inputs', 'open-input-history')
 
 #vd.option('plugins_url', 'https://visidata.org/plugins/plugins.jsonl', 'source of plugins sheet')
 
@@ -216,37 +229,52 @@ def inputRegexSubstOld(vd, prompt):
     return dict(before=before, after=after)
 
 
-visidata.Sheet.addCommand('', 'addcol-subst', 'addColumnAtCursor(Column(cursorCol.name + "_re", getter=regexTransform(cursorCol, **inputRegexSubstOld("transform column by regex: "))))', 'add column derived from current column, replacing regex with subst (may include \1 backrefs)', deprecated=True)
-visidata.Sheet.addCommand('', 'setcol-subst', 'setValuesFromRegex([cursorCol], someSelectedRows, **inputRegexSubstOld("transform column by regex: "))', 'regex/subst - modify selected rows in current column, replacing regex with subst, (may include backreferences \\1 etc)', deprecated=True)
-visidata.Sheet.addCommand('', 'setcol-subst-all', 'setValuesFromRegex(visibleCols, someSelectedRows, **inputRegexSubstOld(f"transform {nVisibleCols} columns by regex: "))', 'modify selected rows in all visible columns, replacing regex with subst (may include \\1 backrefs)', deprecated=True)
+visidata.Sheet.addCommand('', 'addcol-subst', 'addColumnAtCursor(Column(cursorCol.name + "_re", getter=regexTransform(cursorCol, **inputRegexSubstOld("transform column by regex: "))))', 'add column derived from current column, replacing regex with subst (may include \1 backrefs)', deprecated='3.0')
+visidata.Sheet.addCommand('', 'setcol-subst', 'setValuesFromRegex([cursorCol], someSelectedRows, **inputRegexSubstOld("transform column by regex: "))', 'regex/subst - modify selected rows in current column, replacing regex with subst, (may include backreferences \\1 etc)', deprecated='3.0')
+visidata.Sheet.addCommand('', 'setcol-subst-all', 'setValuesFromRegex(visibleCols, someSelectedRows, **inputRegexSubstOld(f"transform {nVisibleCols} columns by regex: "))', 'modify selected rows in all visible columns, replacing regex with subst (may include \\1 backrefs)', deprecated='3.0')
 
-visidata.Sheet.addCommand('', 'split-col', 'addRegexColumns(makeRegexSplitter, cursorCol, inputRegex("split regex: ", type="regex-split"))', 'Add new columns from regex split', deprecated=True)
-visidata.Sheet.addCommand('', 'capture-col', 'addRegexColumns(makeRegexMatcher, cursorCol, inputRegex("capture regex: ", type="regex-capture"))', 'add new column from capture groups of regex; requires example row', deprecated=True)
+visidata.Sheet.addCommand('', 'split-col', 'addRegexColumns(makeRegexSplitter, cursorCol, inputRegex("split regex: ", type="regex-split"))', 'Add new columns from regex split', deprecated='3.0')
+visidata.Sheet.addCommand('', 'capture-col', 'addRegexColumns(makeRegexMatcher, cursorCol, inputRegex("capture regex: ", type="regex-capture"))', 'add new column from capture groups of regex; requires example row', deprecated='3.0')
 
 #vd.option('cmdlog_histfile', '', 'file to autorecord each cmdlog action to', sheettype=None)
 #BaseSheet.bindkey('KEY_BACKSPACE', 'menu-help')
 
-@deprecated('3.0', 'vd.callNoExceptions(col.setValue, row, value)')
 @visidata.Column.api
+@deprecated('3.0', 'vd.callNoExceptions(col.setValue, row, value)')
 def setValueSafe(self, row, value):
     'setValue and ignore exceptions.'
     return vd.callNoExceptions(self.setValue, row, value)
 
-@deprecated('3.0', 'vd.callNoExceptions(sheet.checkCursor)')
 @visidata.BaseSheet.api
+@deprecated('3.0', 'vd.callNoExceptions(sheet.checkCursor)')
 def checkCursorNoExceptions(sheet):
     return vd.callNoExceptions(sheet.checkCursor)
 
-@deprecated('3.1', 'vd.memoValue(name, value, displayvalue)')
 @VisiData.api
+@deprecated('3.1', 'vd.memoValue(name, value, displayvalue)')
 def memo(vd, name, col, row):
     return vd.memoValue(name, col.getTypedValue(row), col.getDisplayValue(row))
 
-alias('view-cell', 'pyobj-cell')
+deprecated_alias('3.1', 'view-cell', 'pyobj-cell')
 
 vd.optalias('textwrap_cells', 'disp_wrap_max_lines', 3) # wordwrap text for multiline rows
 
-@deprecated('3.1', 'sheet.rowname(row)')
 @visidata.TableSheet.api
+@deprecated('3.1', 'sheet.rowname(row)')
 def keystr(sheet, row):
     return sheet.rowname(row)
+
+vd.optalias('color_refline', 'color_graph_refline') # color_refline was used in v3.1 by mistake
+
+@visidata.TableSheet.api
+@deprecated('3.2', '[self.unsetKeys([c]) if c.keycol else self.setKeys([c]) for c in cols]')
+def toggleKeys(self, cols):
+    for col in cols:
+        if col.keycol:
+            self.unsetKeys([col])
+        else:
+            self.setKeys([col])
+
+vd.optalias('disp_pixel_random', 'disp_graph_pixel_random')  #2661
+
+vd.addGlobals(deprecated_warn=deprecated_warn)

visidata/errors.py

@@ -1,4 +1,6 @@
 import traceback
+import sys
+import re
 
 from visidata import vd, VisiData
 
@@ -10,10 +12,43 @@ class ExpectedException(Exception):
     pass
 
 
-def stacktrace(e=None):
-    if not e:
-        return traceback.format_exc().strip().splitlines()
-    return traceback.format_exception_only(type(e), e)
+def stacktrace(e=None, exclude_caller=False):
+    '''Return a list of strings for the stack trace, without newlines
+    at the end. If an exception handler is executing, and *e* is none,
+    the stack trace includes extra levels of callers beyond the level
+    where the exception was caught. If *exclude_caller* is True, the
+    trace will exclude the function that called stacktrace(). The
+    trace will exclude several uninformative levels that are run
+    in interactive visidata.'''
+
+    if e:
+        return traceback.format_exception_only(type(e), e)
+    #in Python 3.11 we can replace sys.exc_info() with sys.exception()
+    handling = (sys.exc_info() != (None, None, None))
+
+    stack = ''.join(traceback.format_stack()).strip().splitlines()
+
+    if handling:
+        trim_levels = 2       # remove levels for stacktrace() -> format_stack()
+        if exclude_caller:
+            trim_levels += 1
+        trace_above = stack[:-2*trim_levels]
+    else:
+        trace_above = stack
+    if trace_above:
+        trace_above[0] = '  ' + trace_above[0]  #fix indent level of first line
+    try:
+        # remove several levels of uninformative stacktrace in typical interactive vd
+        idx = trace_above.index('    ret = vd.mainloop(scr)')
+        trace_above = trace_above[idx+1:]
+    except ValueError:
+        pass
+    if not handling:
+        return trace_above
+    # remove lines that mark error columns with carets and sometimes tildes
+    trace_below = [ line for line in traceback.format_exc().strip().splitlines() if not re.match('^ *~*\\^+$', line) ]
+    # move the "Traceback (most recent call last) header to the top of the output
+    return [trace_below[0]] + trace_above + trace_below[1:]
 
 
 @VisiData.api
@@ -21,7 +56,8 @@ def exceptionCaught(vd, exc=None, status=True, **kwargs):
     'Add *exc* to list of last errors and add to status history.  Show on left status bar if *status* is True.  Reraise exception if options.debug is True.'
     if isinstance(exc, ExpectedException):  # already reported, don't log
         return
-    vd.lastErrors.append(stacktrace())
+    # save a stack trace that does not include this function
+    vd.lastErrors.append(stacktrace(exclude_caller=True))
     if status:
         vd.status(f'{type(exc).__name__}: {exc}', priority=2)
     else:

visidata/{features → experimental}/helloworld.py

@@ -7,4 +7,4 @@ from visidata import vd, BaseSheet
 
 vd.option('hello_world', '¡Hola mundo!', 'shown by the hello-world command')
 
-BaseSheet.addCommand('KEY_F(2)', 'hello-world', 'status(options.hello_world)', 'print greeting to status')
+BaseSheet.addCommand('F2', 'hello-world', 'status(options.hello_world)', 'print greeting to status')

visidata/expr.py

@@ -100,6 +100,7 @@ Sheet.addCommand('=', 'addcol-expr', 'addColumnAtCursor(ExprColumn(inputExpr("ne
 Sheet.addCommand('g=', 'setcol-expr', 'cursorCol.setValuesFromExpr(someSelectedRows, inputExpr("set selected="), curcol=cursorCol)', 'set current column for selected rows to result of Python expression')
 Sheet.addCommand('z=', 'setcell-expr', 'cursorCol.setValues([cursorRow], evalExpr(inputExpr("set expr="), row=cursorRow, curcol=cursorCol))', 'evaluate Python expression on current row and set current cell with result of Python expression')
 Sheet.addCommand('gz=', 'setcol-iter', 'cursorCol.setValues(someSelectedRows, *list(itertools.islice(eval(input("set column= ", "expr", completer=CompleteExpr())), len(someSelectedRows))))', 'set current column for selected rows to the items in result of Python sequence expression')
+Sheet.addCommand('', 'addcol-iter', 'iter_expr=inputExpr("new column iterator expr: "); it = eval(iter_expr, getGlobals()); c=SettableColumn(); addColumnAtCursor(c); c.setValues(rows, *it)', 'add column with values from a Python sequence expression, repeating it if needed to fill')
 
 Sheet.addCommand(None, 'show-expr', 'status(evalExpr(inputExpr("show expr="), row=cursorRow, curcol=cursorCol))', 'evaluate Python expression on current row and show result on status line')
 

visidata/extensible.py

@@ -50,6 +50,7 @@ class Extensible:
         from visidata import vd
         func.importingModule = vd.importingModule
         setattr(cls, func.__name__, func)
+        func._extensible_api = True
         return func
 
     @classmethod
@@ -97,6 +98,7 @@ class Extensible:
         oldfunc = getattr(cls, name, None)
         if oldfunc:
             func = wraps(oldfunc)(func)
+        func._extensible_api = True
         setattr(cls, name, func)
         return func
 
@@ -107,6 +109,7 @@ class Extensible:
         def dofunc(self):
             return func(self)
         setattr(cls, func.__name__, dofunc)
+        func._extensible_api = True
         return dofunc
 
     @classmethod
@@ -121,6 +124,7 @@ class Extensible:
                 setattr(self, name, func(self))
             return getattr(self, name)
         setattr(cls, func.__name__, get_if_not)
+        func._extensible_api = True
         return get_if_not
 
     @classmethod

visidata/features/cmdpalette.py

@@ -1,6 +1,6 @@
 import collections
 from functools import partial
-from visidata import DrawablePane, BaseSheet, vd, VisiData, CompleteKey, clipdraw, HelpSheet, colors, AcceptInput, AttrDict, drawcache_property
+from visidata import DrawablePane, BaseSheet, vd, VisiData, CompleteKey, clipdraw, HelpSheet, colors, AcceptInput, AttrDict, drawcache_property, dispwidth
 
 
 vd.theme_option('color_cmdpalette', 'black on 72', 'base color of command palette')
@@ -180,7 +180,7 @@ def inputLongname(sheet):
         formatted_name = f'[:bold][:onclick {row.longname}]{formatted_longname}[/][/]'
         if vd.options.debug and match:
             keystrokes = f'[{match.score}]'
-        r = f' [:keystrokes]{keystrokes.rjust(len(prompt)-5)}[/]  '
+        r = f' [:keystrokes]{keystrokes.rjust(dispwidth(prompt)-5)}[/]  '
         if trigger_key:
             r += f'[:keystrokes]{trigger_key}[/]'
         else:
@@ -213,4 +213,4 @@ def exec_longname(sheet, longname):
 
 
 vd.addCommand('Space', 'exec-longname', 'exec_longname(inputLongname())', 'execute command by its longname')
-vd.addCommand('zSpace', 'exec-longname-simple', 'exec_longname(inputLongnameSimple())', 'execute command by its longname')
+vd.addCommand('zSpace', 'exec-longname-simple', 'exec_longname(inputLongnameSimple())', 'execute command by its longname (without command palette)')