mwxlib 1.4.11__py3-none-any.whl → 1.4.15__py3-none-any.whl

mwx/bookshelf.py

@@ -115,6 +115,7 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
                     editor.handler.append(self.context)
                 self.build_tree()
         wx.CallAfter(_attach)
+        wx.CallAfter(self.ExpandAll)
     
     def OnDestroy(self, evt):
         if self and self.parent:

mwx/controls.py

@@ -1,8 +1,9 @@
 #! python3
 """mwxlib param controller and wx custom controls.
 """
+from contextlib import contextmanager
 from itertools import chain
-import inspect
+import io
 import wx
 import wx.lib.platebtn as pb
 import wx.lib.scrolledpanel as scrolled
@@ -772,6 +773,19 @@ class Clipboard:
     This does not work unless wx.App instance exists.
     The clipboard data cannot be transferred unless wx.Frame exists.
     """
+    @contextmanager
+    @staticmethod
+    def istrstream():
+        with io.StringIO(Clipboard.read()) as f:
+            yield f
+    
+    @contextmanager
+    @staticmethod
+    def ostrstream():
+        with io.StringIO() as f:
+            yield f
+            Clipboard.write(f.getvalue())
+    
     @staticmethod
     def read(verbose=False):
         do = wx.TextDataObject()
@@ -849,7 +863,7 @@ class Clipboard:
 ## --------------------------------
 
 class Icon(wx.Bitmap):
-    """Returns an iconic bitmap with the specified size (w, h).
+    """Return an iconic bitmap with the specified size (w, h).
     
     The key is either Icon.provided_arts or Icon.custom_images key.
     If the key is empty it returns a transparent bitmap, otherwise NullBitmap.

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.4.11"
+__version__ = "1.4.15"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -24,7 +24,7 @@ from .utilus import get_rootpath, ignore, warn
 from .utilus import FSM, TreeList, apropos, typename, where, mro, pp
 
 
-def deb(target=None, loop=True, locals=None, debrc=None, **kwargs):
+def deb(target=None, loop=True, locals=None, **kwargs):
     """Dive into the process.
     
     Args:
@@ -32,17 +32,15 @@ def deb(target=None, loop=True, locals=None, debrc=None, **kwargs):
                   If None, the target is set to `__main__`.
         loop    : If True, the app and the mainloop will be created.
         locals  : Additional context of the shell
-        debrc   : file name of the session. Defaults to None.
-                  If None, no session will be created or saved.
-                  If `''`, the default session (.debrc) will be loaded.
         
-        **kwargs: Nautilus ShellFrame arguments
+        **kwargs: ShellFrame and Nautilus arguments
         
+            - session           : file name of the session. Defaults to None.
+            - ensureClose       : True => EVT_CLOSE will close the window.
+                                  False => EVT_CLOSE will hide the window.
             - introText         : introductory of the shell
             - startupScript     : startup script file (default None)
             - execStartupScript : True => Execute the startup script.
-            - ensureClose       : True => EVT_CLOSE will close the window.
-                                  False => EVT_CLOSE will hide the window.
     
     Note:
         This will execute the startup script $(PYTHONSTARTUP).
@@ -50,9 +48,13 @@ def deb(target=None, loop=True, locals=None, debrc=None, **kwargs):
     kwargs.setdefault("introText", f"mwx {__version__}\n")
     kwargs.setdefault("execStartupScript", True)
     kwargs.setdefault("ensureClose", True)
-
+    
+    if "debrc" in kwargs: # for backward compatibility
+        warn("Deprecated keyword: 'debrc'. Use 'session' instead.", DeprecationWarning)
+        kwargs.setdefault('session', kwargs.pop('debrc'))
+    
     app = wx.GetApp() or wx.App()
-    frame = ShellFrame(None, target, session=debrc, **kwargs)
+    frame = ShellFrame(None, target, **kwargs)
     frame.Show()
     frame.rootshell.SetFocus()
     if locals:
@@ -219,7 +221,7 @@ class KeyCtrlInterfaceMixin:
     
     @staticmethod
     def getKeyState(key):
-        """Returns state of speckey (cf. wx.GetKeyState)."""
+        """Return state of speckey (cf. wx.GetKeyState)."""
         try:
             return wx.GetKeyState(_speckeys_wxkmap[key])
         except KeyError:
@@ -874,12 +876,12 @@ class AuiNotebook(aui.AuiNotebook):
     
     @property
     def _all_tabs(self): # (deprecated) internal use only
-        """Returns all AuiTabCtrl objects (internal use only)."""
+        """Return all AuiTabCtrl objects (internal use only)."""
         return [x for x in self.Children if isinstance(x, aui.AuiTabCtrl)]
     
     @property
     def _all_panes(self): # (deprecated) internal use only
-        """Returns all AuiPaneInfo excluding `dummy` one (internal use only)."""
+        """Return all AuiPaneInfo excluding `dummy` one (internal use only)."""
         return list(self._mgr.AllPanes)[1:]
     
     def get_pages(self, type=None):
@@ -917,7 +919,7 @@ class AuiNotebook(aui.AuiNotebook):
             return True
     
     def find_tab(self, win):
-        """Returns AuiTabCtrl and AuiNotebookPage for the window.
+        """Return AuiTabCtrl and AuiNotebookPage for the window.
         
         cf. aui.AuiNotebook.FindTab -> bool, tab, idx
         Note:
@@ -1256,8 +1258,8 @@ class ShellFrame(MiniFrame):
                   'C-f pressed' : (0, self.OnFindText),
                    'f3 pressed' : (0, self.OnFindNext),
                  'S-f3 pressed' : (0, self.OnFindPrev),
-                  'f11 pressed' : (0, _F(self.toggle_window, self.ghost, alias='toggle_ghost')),
-                'S-f11 pressed' : (0, _F(self.toggle_window, self.watcher, alias='toggle_watcher')),
+                  'f11 pressed' : (0, _F(self.toggle_window, win=self.ghost, alias='toggle_ghost')),
+                'S-f11 pressed' : (0, _F(self.toggle_window, win=self.watcher, alias='toggle_watcher')),
                   'f12 pressed' : (0, _F(self.Close, alias="close")),
              '*f[0-9]* pressed' : (0, ),
             },

mwx/graphman.py

@@ -1,9 +1,9 @@
 #! python3
 """Graph manager.
 """
+from contextlib import contextmanager
 from functools import wraps
 from importlib import reload, import_module
-from contextlib import contextmanager
 from bdb import BdbQuit
 from pprint import pformat
 import threading
@@ -353,9 +353,9 @@ class LayerInterface(CtrlInterface):
                    'thread_end' : [ None ], # end processing
                   'thread_quit' : [ None ], # terminated by user
                  'thread_error' : [ None ], # failed in error
-                   'page_shown' : [ None, _F(self.Draw, True)  ],
-                  'page_closed' : [ None, _F(self.Draw, False) ],
-                  'page_hidden' : [ None, _F(self.Draw, False) ],
+                   'page_shown' : [ None, _F(self.Draw, show=True)  ],
+                  'page_closed' : [ None, _F(self.Draw, show=False) ],
+                  'page_hidden' : [ None, _F(self.Draw, show=False) ],
             },
             0 : {
                   'C-c pressed' : (0, _F(copy_params)),
@@ -451,7 +451,7 @@ class LayerInterface(CtrlInterface):
         lambda self,v: self.Show(v))
     
     def IsShown(self):
-        """Returns True if the window is physically visible on the screen.
+        """Return True if the window is physically visible on the screen.
         
         (override) Equivalent to ``IsShownOnScreen``.
                    Note: The instance could be a page within a notebook.
@@ -1348,7 +1348,7 @@ class Frame(mwx.Frame):
             plug = _plug
         init(shell)
         self.shellframe.Show()
-        if wx.GetKeyState(wx.WXK_SHIFT):
+        if wx.GetKeyState(wx.WXK_SHIFT): # open the source code.
             self.shellframe.load(plug)
     
     def OnLoadPlugins(self, evt):
@@ -1383,9 +1383,9 @@ class Frame(mwx.Frame):
             view = self.selected_view
         
         if not filename:
-            fn = view.frame.pathname if view.frame else ''
+            default_path = view.frame.pathname if view.frame else None
             with wx.FileDialog(self, "Select index file to import",
-                    defaultDir=os.path.dirname(fn or ''),
+                    defaultDir=os.path.dirname(default_path or ''),
                     defaultFile=self.ATTRIBUTESFILE,
                     wildcard="Index (*.index)|*.index|"
                              "ALL files (*.*)|*.*",
@@ -1420,9 +1420,9 @@ class Frame(mwx.Frame):
                 return None
         
         if not filename:
-            fn = view.frame.pathname if view.frame else ''
+            default_path = view.frame.pathname if view.frame else None
             with wx.FileDialog(self, "Select index file to export",
-                    defaultDir=os.path.dirname(fn or ''),
+                    defaultDir=os.path.dirname(default_path or ''),
                     defaultFile=self.ATTRIBUTESFILE,
                     wildcard="Index (*.index)|*.index",
                     style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:
@@ -1437,7 +1437,8 @@ class Frame(mwx.Frame):
                 self.message("Export index of {!r}...".format(frame.name))
                 fn = frame.pathname
                 if not fn:
-                    fn = os.path.join(savedir, frame.name) # new file
+                    fn = os.path.join(savedir,
+                            re.sub(r'[\/:*?"<>|]', '_', frame.name)) # replace invalid chars
                 if not os.path.exists(fn):
                     if not fn.endswith('.tif'):
                         fn += '.tif'
@@ -1592,9 +1593,9 @@ class Frame(mwx.Frame):
             paths = [paths]
         
         if paths is None:
-            fn = view.frame.pathname if view.frame else ''
+            default_path = view.frame.pathname if view.frame else None
             with wx.FileDialog(self, "Open image files",
-                    defaultDir=os.path.dirname(fn or ''),
+                    defaultDir=os.path.dirname(default_path or ''),
                     defaultFile='',
                     wildcard='|'.join(self.wildcards),
                     style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST
@@ -1649,10 +1650,10 @@ class Frame(mwx.Frame):
                 return None
         
         if not path:
-            fn = view.frame.pathname if view.frame else ''
+            default_path = view.frame.pathname if view.frame else None
             with wx.FileDialog(self, "Save buffer as",
-                    defaultDir=os.path.dirname(fn or ''),
-                    defaultFile=re.sub(r'[\/:*?"<>|]', '_', frame.name),
+                    defaultDir=os.path.dirname(default_path or ''),
+                    defaultFile=re.sub(r'[\/:*?"<>|]', '_', frame.name), # replace invalid chars
                     wildcard='|'.join(self.wildcards),
                     style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:
                 if dlg.ShowModal() != wx.ID_OK:

mwx/matplot2g.py

@@ -419,8 +419,8 @@ class GraphPlot(MatplotPanel):
                'M-down pressed' : [ None, self.OnPageDown ],
                'pageup pressed' : [ None, self.OnPageUp ],
              'pagedown pressed' : [ None, self.OnPageDown ],
-                 'home pressed' : [ None, _F(self.select, 0) ],
-                  'end pressed' : [ None, _F(self.select, -1) ],
+                 'home pressed' : [ None, _F(self.select, index=0) ],
+                  'end pressed' : [ None, _F(self.select, index=-1) ],
                   'M-a pressed' : [ None, _F(self.fit_to_canvas) ],
                   'C-a pressed' : [ None, _F(self.fit_to_axes) ],
                   'C-i pressed' : [ None, _F(self.invert_cmap) ],
@@ -636,6 +636,8 @@ class GraphPlot(MatplotPanel):
             show    : Show immediately when loaded.
             **kwargs: frame attributes.
         """
+        assert buf is not None, "Load buffer must be an array or string (not None)"
+        
         if isinstance(buf, str):
             buf = Image.open(buf)
         
@@ -673,9 +675,11 @@ class GraphPlot(MatplotPanel):
                 self.axes.axis(art.get_extent())
         return art
     
-    def select(self, j):
-        if isinstance(j, (str, AxesImagePhantom)):
-            j = self.index(j)
+    def select(self, index):
+        if isinstance(index, (str, AxesImagePhantom)):
+            j = self.index(index)
+        else:
+            j = index
         
         for art in self.__Arts: # Hide all frames
             art.set_visible(0)
@@ -1637,8 +1641,7 @@ class GraphPlot(MatplotPanel):
                     color='red', size=7, #fontsize=8,
                   )
                 )
-            self.selector = self.get_current_mark()
-            self.trace_point(*self.selector, type=MARK)
+            self.trace_point(*self.get_current_mark(), type=MARK)
         self.draw(self.marked)
     
     def OnMarkAppend(self, evt):
@@ -1661,7 +1664,7 @@ class GraphPlot(MatplotPanel):
         else:
             self.__marksel = [k]
         self.update_art_of_mark()
-        
+        self.selector = self.get_current_mark()
         if self.selector.shape[1] > 1:
             self.handler('line_drawn', self.frame) # 多重マーカー選択時
     

mwx/nutshell.py

@@ -1,9 +1,9 @@
 #! python3
 """mwxlib Nautilus in the shell.
 """
+from contextlib import contextmanager
 from functools import wraps
 from importlib import import_module
-from contextlib import contextmanager
 from pathlib import Path
 from pprint import pformat
 from bdb import BdbQuit
@@ -288,9 +288,17 @@ class AutoCompInterfaceMixin:
     
     def _get_words_hint(self):
         cmdl = self.GetTextRange(self.bol, self.cpos)
-        text = next(split_words(cmdl, reverse=1), '')
+        if cmdl.endswith(' '): # 前の文字が空白の場合はスキップする
+            text = ''
+        else:
+            text = next(split_words(cmdl, reverse=1), '')
         return text.rpartition('.') # -> text, sep, hint
     
+    def clear_autocomp(self, evt):
+        if self.AutoCompActive():
+            self.AutoCompCancel()
+        self.message("")
+    
     def call_history_comp(self, evt):
         """Called when history-comp mode."""
         if not self.CanEdit():
@@ -345,8 +353,9 @@ class AutoCompInterfaceMixin:
                         return lh
         
         cmdl = self.GetTextRange(self.bol, self.cpos)
-        hint = re.search(r"[\w.]*$", cmdl).group(0) # extract the last word
+        hint = re.search(r"[\w.]*$", cmdl).group(0) # extract the last word including dots
         try:
+            ## from * import ...
             if (m := re.match(r"from\s+([\w.]+)\s+import\s+(.*)", cmdl)):
                 text, hints = m.groups()
                 if not _continue(hints) and not force:
@@ -366,13 +375,14 @@ class AutoCompInterfaceMixin:
                     q = f"{text}.{hint}".lower()
                     keys = [x[len(text)+1:] for x in self.modules if x.lower().startswith(q)]
                     modules.update(k for k in keys if '.' not in k)
-            
+            ## import ...
             elif (m := re.match(r"(import|from)\s+(.*)", cmdl)):
                 text, hints = m.groups()
                 if not _continue(hints) and not force:
                     self.message("[module]>>> waiting for key input...")
                     return
                 modules = self.modules
+            ## Module X.Y.Z
             else:
                 text, sep, hint = self._get_words_hint()
                 obj = self.eval(text)
@@ -401,11 +411,15 @@ class AutoCompInterfaceMixin:
         if not self.CanEdit():
             self.handler('quit', evt)
             return
+        
+        text, sep, hint = self._get_words_hint()
+        if not text:
+            self.handler('quit', evt)
+            self.message("- No autocompletion candidates or hints found.")
+            return
         try:
-            text, sep, hint = self._get_words_hint()
-            obj = self.eval(text)
             ## dir = introspect.getAttributeNames @TODO in wx ver 4.2.3
-            
+            obj = self.eval(text)
             P = re.compile(hint)
             p = re.compile(hint, re.I)
             words = sorted([x for x in dir(obj) if p.match(x)], key=lambda s:s.upper())
@@ -429,11 +443,15 @@ class AutoCompInterfaceMixin:
         if not self.CanEdit():
             self.handler('quit', evt)
             return
+        
+        text, sep, hint = self._get_words_hint()
+        if not text:
+            self.handler('quit', evt)
+            self.message("- No autocompletion candidates or hints found.")
+            return
         try:
-            text, sep, hint = self._get_words_hint()
-            obj = self.eval(text)
             ## dir = introspect.getAttributeNames @TODO in wx ver 4.2.3.
-            
+            obj = self.eval(text)
             P = re.compile(hint)
             p = re.compile(hint, re.I)
             words = sorted([x for x in dir(obj) if p.search(x)], key=lambda s:s.upper())
@@ -478,7 +496,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
                 'pointer_unset' : [ None, dispatch ],
             },
             0 : {
-               'insert pressed' : (0, _F(self.over, None, doc="toggle-over")),
+               'insert pressed' : (0, _F(self.over, mode=None, doc="toggle-over")),
                'C-left pressed' : (0, _F(self.WordLeft)),
               'C-right pressed' : (0, _F(self.WordRightEnd)),
              'C-S-left pressed' : (0, _F(self.selection_backward_word_or_paren)),
@@ -559,7 +577,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.SetKeyWords(1, ' '.join(builtins.__dict__)
                           + ' '.join(_dunders(type, int, float, str, bytes,
                                               tuple, list, range, operator,))
-                          + ' self this')
+                          + ' self this shell')
         
         ## AutoComp setting
         self.AutoCompSetAutoHide(False)
@@ -867,7 +885,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         return sty
     
     def get_char(self, pos):
-        """Returns the character at the given position."""
+        """Return the character at the given position."""
         return chr(self.GetCharAt(pos))
     
     def get_text(self, start, end):
@@ -1018,7 +1036,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     
     @classmethod
     def py_calc_indentation(self, text):
-        """Returns indent spaces for the command text."""
+        """Return indent spaces for the command text."""
         text = self.py_strip_comments(text)
         lstr, indent = self.py_strip_indents(text)
         text = text.rstrip()
@@ -1032,7 +1050,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     
     @classmethod
     def py_strip_indents(self, text):
-        """Returns left-stripped text and the number of indent spaces."""
+        """Return left-stripped text and the number of indent spaces."""
         text = self.py_strip_prompts(text) # cf. shell.lstripPrompt(text)
         lstr = text.lstrip(' \t')
         indent = len(text) - len(lstr)
@@ -1040,7 +1058,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     
     @classmethod
     def py_strip_prompts(self, text):
-        """Returns text without a leading prompt."""
+        """Return text without a leading prompt."""
         for ps in (sys.ps1, sys.ps2, sys.ps3):
             if text.startswith(ps):
                 text = text[len(ps):]
@@ -1049,7 +1067,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     
     @classmethod
     def py_strip_comments(self, text):
-        """Returns text without comments."""
+        """Return text without comments."""
         return ''.join(split_tokens(text, comment=False))
     
     ## --------------------------------
@@ -1783,14 +1801,14 @@ class Buffer(EditorInterface, EditWindow):
     
     @property
     def need_buffer_save(self):
-        """Returns whether the buffer should be saved.
+        """Return whether the buffer should be saved.
         The file has been modified internally.
         """
         return self.mtdelta is not None and self.IsModified()
     
     @property
     def need_buffer_load(self):
-        """Returns whether the buffer should be loaded.
+        """Return whether the buffer should be loaded.
         The file has been modified externally.
         """
         return self.mtdelta is not None and self.mtdelta > 0
@@ -1854,11 +1872,6 @@ class Buffer(EditorInterface, EditWindow):
                     self.ReplaceSelection('')
             self.message("")
         
-        def clear_autocomp(evt):
-            if self.AutoCompActive():
-                self.AutoCompCancel()
-            self.message("")
-        
         def fork(evt):
             self.handler.fork(self.handler.current_event, evt)
         
@@ -1891,15 +1904,14 @@ class Buffer(EditorInterface, EditWindow):
              '*button* pressed' : (0, skip, dispatch),
                'escape pressed' : (-1, self.on_enter_escmap),
                   'C-h pressed' : (0, self.call_helpTip),
-                    '. pressed' : (2, self.OnEnterDot),
                   'C-. pressed' : (2, self.call_word_autocomp),
                   'C-/ pressed' : (3, self.call_apropos_autocomp),
                   'M-. pressed' : (2, self.call_word_autocomp),
                   'M-/ pressed' : (3, self.call_apropos_autocomp),
             },
             2 : { # word auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
+                         'quit' : (0, self.clear_autocomp),
+                    '* pressed' : (0, self.clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
                'escape pressed' : (0, clear, skip),
@@ -1917,7 +1929,7 @@ class Buffer(EditorInterface, EditWindow):
               '*delete pressed' : (2, skip),
            '*backspace pressed' : (2, skip),
           '*backspace released' : (2, self.call_word_autocomp),
-         '*S-backspace pressed' : (0, clear_autocomp, fork),
+         '*S-backspace pressed' : (0, self.clear_autocomp, fork),
                  '*alt pressed' : (2, ),
                 '*ctrl pressed' : (2, ),
                '*shift pressed' : (2, ),
@@ -1925,8 +1937,8 @@ class Buffer(EditorInterface, EditWindow):
              '*f[0-9]* pressed' : (2, ),
             },
             3 : { # apropos auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
+                         'quit' : (0, self.clear_autocomp),
+                    '* pressed' : (0, self.clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
                'escape pressed' : (0, clear, skip),
@@ -1944,7 +1956,7 @@ class Buffer(EditorInterface, EditWindow):
               '*delete pressed' : (3, skip),
            '*backspace pressed' : (3, skip),
           '*backspace released' : (3, self.call_apropos_autocomp),
-         '*S-backspace pressed' : (0, clear_autocomp, fork),
+         '*S-backspace pressed' : (0, self.clear_autocomp, fork),
                  '*alt pressed' : (3, ),
                 '*ctrl pressed' : (3, ),
                '*shift pressed' : (3, ),
@@ -2016,14 +2028,6 @@ class Buffer(EditorInterface, EditWindow):
         self.update_caption()
         evt.Skip()
     
-    def OnEnterDot(self, evt):
-        p = self.cpos
-        lst = self.get_style(p-1)
-        rst = self.get_style(p)
-        if lst not in ('moji', 'word', 'rparen') or rst == 'word':
-            self.handler('quit', evt) # don't enter autocomp
-        evt.Skip()
-    
     def on_activated(self, buf):
         """Called when the buffer is activated."""
         self.update_caption()
@@ -2116,6 +2120,7 @@ class Buffer(EditorInterface, EditWindow):
                         sender=self, command=None, more=False)
     
     def eval_line(self):
+        """Evaluate the selected word or line and show calltips."""
         if self.CallTipActive():
             self.CallTipCancel()
         
@@ -2140,6 +2145,7 @@ class Buffer(EditorInterface, EditWindow):
             self.message("No words")
     
     def exec_region(self):
+        """Execute a region of code."""
         try:
             code = compile(self.Text, self.filename, "exec")
             exec(code, self.globals, self.locals)
@@ -2329,7 +2335,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
     
     @property
     def buffer(self):
-        """Returns the currently selected page or None."""
+        """Return the currently selected page or None."""
         return self.CurrentPage
     
     def find_buffer(self, fn):
@@ -2807,11 +2813,6 @@ class Nautilus(EditorInterface, Shell):
                     self.ReplaceSelection('')
             self.message("")
         
-        def clear_autocomp(evt):
-            if self.AutoCompActive():
-                self.AutoCompCancel()
-            self.message("")
-        
         def fork(evt):
             self.handler.fork(self.handler.current_event, evt)
         
@@ -2867,10 +2868,10 @@ class Nautilus(EditorInterface, Shell):
                   'M-j pressed' : (0, _F(self.exec_region)),
                   'C-h pressed' : (0, self.call_helpTip),
                   'M-h pressed' : (0, self.call_helpDoc),
-                    '. pressed' : (2, self.OnEnterDot),
                   'tab pressed' : (1, self.call_history_comp),
                   'M-p pressed' : (1, self.call_history_comp),
                   'M-n pressed' : (1, self.call_history_comp),
+                    '. pressed' : (2, self.OnEnterDot),
                   'C-. pressed' : (2, self.call_word_autocomp),
                   'C-/ pressed' : (3, self.call_apropos_autocomp),
                   'C-, pressed' : (4, self.call_text_autocomp),
@@ -2890,10 +2891,10 @@ class Nautilus(EditorInterface, Shell):
               'S-left released' : (1, self.call_history_comp),
               'S-right pressed' : (1, skip),
              'S-right released' : (1, self.call_history_comp),
-                  'tab pressed' : (1, _F(self._on_completion,  1)), # 古いヒストリへ進む
-                'S-tab pressed' : (1, _F(self._on_completion, -1)), # 新しいヒストリへ戻る
-                  'M-p pressed' : (1, _F(self._on_completion,  1)),
-                  'M-n pressed' : (1, _F(self._on_completion, -1)),
+                  'tab pressed' : (1, _F(self._on_completion, step=1)), # 古いヒストリへ進む
+                'S-tab pressed' : (1, _F(self._on_completion, step=-1)), # 新しいヒストリへ戻る
+                  'M-p pressed' : (1, _F(self._on_completion, step=1)),
+                  'M-n pressed' : (1, _F(self._on_completion, step=-1)),
             '[a-z0-9_] pressed' : (1, skip),
            '[a-z0-9_] released' : (1, self.call_history_comp),
             'S-[a-z\\] pressed' : (1, skip),
@@ -2906,8 +2907,8 @@ class Nautilus(EditorInterface, Shell):
              '*f[0-9]* pressed' : (1, ),
             },
             2 : { # word auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
+                         'quit' : (0, self.clear_autocomp),
+                    '* pressed' : (0, self.clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
                'escape pressed' : (0, clear, skip),
@@ -2925,7 +2926,7 @@ class Nautilus(EditorInterface, Shell):
               '*delete pressed' : (2, skip),
            '*backspace pressed' : (2, self.OnBackspace),
           '*backspace released' : (2, self.call_word_autocomp),
-         '*S-backspace pressed' : (0, clear_autocomp, fork),
+         '*S-backspace pressed' : (0, self.clear_autocomp, fork),
                   'C-j pressed' : (2, _F(self.eval_line)),
                  '*alt pressed' : (2, ),
                 '*ctrl pressed' : (2, ),
@@ -2934,8 +2935,8 @@ class Nautilus(EditorInterface, Shell):
              '*f[0-9]* pressed' : (2, ),
             },
             3 : { # apropos auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
+                         'quit' : (0, self.clear_autocomp),
+                    '* pressed' : (0, self.clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
                'escape pressed' : (0, clear, skip),
@@ -2953,7 +2954,7 @@ class Nautilus(EditorInterface, Shell):
               '*delete pressed' : (3, skip),
            '*backspace pressed' : (3, self.OnBackspace),
           '*backspace released' : (3, self.call_apropos_autocomp),
-         '*S-backspace pressed' : (0, clear_autocomp, fork),
+         '*S-backspace pressed' : (0, self.clear_autocomp, fork),
                   'C-j pressed' : (3, _F(self.eval_line)),
                  '*alt pressed' : (3, ),
                 '*ctrl pressed' : (3, ),
@@ -2962,8 +2963,8 @@ class Nautilus(EditorInterface, Shell):
              '*f[0-9]* pressed' : (3, ),
             },
             4 : { # text auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
+                         'quit' : (0, self.clear_autocomp),
+                    '* pressed' : (0, self.clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
                'escape pressed' : (0, clear, skip),
@@ -2981,7 +2982,7 @@ class Nautilus(EditorInterface, Shell):
               '*delete pressed' : (4, skip),
            '*backspace pressed' : (4, self.OnBackspace),
           '*backspace released' : (4, self.call_text_autocomp),
-         '*S-backspace pressed' : (0, clear_autocomp, fork),
+         '*S-backspace pressed' : (0, self.clear_autocomp, fork),
                   'C-j pressed' : (4, _F(self.eval_line)),
                  '*alt pressed' : (4, ),
                 '*ctrl pressed' : (4, ),
@@ -2990,8 +2991,8 @@ class Nautilus(EditorInterface, Shell):
              '*f[0-9]* pressed' : (4, ),
             },
             5 : { # module auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
+                         'quit' : (0, self.clear_autocomp),
+                    '* pressed' : (0, self.clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
                'escape pressed' : (0, clear, skip),
@@ -3006,11 +3007,12 @@ class Nautilus(EditorInterface, Shell):
             'S-[a-z\\] pressed' : (5, skip),
            'S-[a-z\\] released' : (5, self.call_module_autocomp),
                   '\\ released' : (5, self.call_module_autocomp),
+                  'C-m pressed' : (5, _F(self.call_module_autocomp, force=1)),
                   'M-m pressed' : (5, _F(self.call_module_autocomp, force=1)),
               '*delete pressed' : (5, skip),
            '*backspace pressed' : (5, self.OnBackspace),
           '*backspace released' : (5, self.call_module_autocomp),
-         '*S-backspace pressed' : (0, clear_autocomp, fork),
+         '*S-backspace pressed' : (0, self.clear_autocomp, fork),
                  '*alt pressed' : (5, ),
                 '*ctrl pressed' : (5, ),
                '*shift pressed' : (5, ),
@@ -3626,7 +3628,7 @@ class Nautilus(EditorInterface, Shell):
     ## --------------------------------
     
     def eval_line(self):
-        """Evaluate the selected word or line."""
+        """Evaluate the selected word or line and show calltips."""
         if self.CallTipActive():
             self.CallTipCancel()
         
@@ -3654,7 +3656,7 @@ class Nautilus(EditorInterface, Shell):
             self.message("No words")
     
     def exec_region(self):
-        """Execute the the selected region."""
+        """Execute a region of code."""
         if self.CallTipActive():
             self.CallTipCancel()
         

mwx/wxwit.py

@@ -92,7 +92,7 @@ class Inspector(it.InspectionTree, CtrlInterface):
             self.BuildTree(obj)
     
     def GetTextForWidget(self, obj):
-        """Returns the string to be used in the tree for a widget.
+        """Return the string to be used in the tree for a widget.
         
         (override) Make better object name and Id.
         """

{mwxlib-1.4.11.dist-info → mwxlib-1.4.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mwxlib
-Version: 1.4.11
+Version: 1.4.15
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto

{mwxlib-1.4.11.dist-info → mwxlib-1.4.15.dist-info}/RECORD

@@ -1,20 +1,20 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
-mwx/bookshelf.py,sha256=MXjrm_ryRGHvOFKu8wb10qz_oka70xW2yFbYjBMYfns,8140
-mwx/controls.py,sha256=1zLWlPy0RTLHYlvxjz3ulDoTx3-uPUD3TqK7dGRA4wg,49563
-mwx/framework.py,sha256=1p24_snigDnU-9CwjQJdQeEsS44z27IwvC67reS6zX8,76832
-mwx/graphman.py,sha256=4hS3zBH1Ob9CcsWBsnPo5Tw6RTiE0vKjKpcjeZ5RSrU,70049
+mwx/bookshelf.py,sha256=XbJ9HUH5COUm-BVI7iLC7gr9Hj9l-sFjOoaCAqNS4aA,8178
+mwx/controls.py,sha256=TyXDovOo52XaiZQW4nW_JxOYPdszLsXUwPOY04KXOzM,49903
+mwx/framework.py,sha256=0bNeso5KBFhb3keziq-Y8v-N2ko6KkxXLl7NCZ7L50c,76905
+mwx/graphman.py,sha256=RlIQ_jhwv2870rC_R0xWCHFv5VsLzT8InidDKobKFes,70270
 mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
 mwx/matplot2.py,sha256=A2PbHI5UcuAvINfnm6GG7CXpbexhzvtyVLQOwcbRqnc,33015
-mwx/matplot2g.py,sha256=HTSh0vd06-HhiwEZbhwFD6HGjfnwGQ7H6QQzTucOx3c,65220
+mwx/matplot2g.py,sha256=3FD45UDkrWrypMDTUQx6SL5jU6fCdjXsJtH3k_GDUL0,65373
 mwx/matplot2lg.py,sha256=cb0EZXivccDQu4oFj5ddSUF9pEE4f5UuFJJK2ELItww,27404
 mwx/mgplt.py,sha256=8mXbHpCmm7lz3XbAxOg7IVC7DaSGBEby1UfTlMl9kjk,5604
-mwx/nutshell.py,sha256=aZSXcWMsVF_til2ZCASwGwK1Jqq3qfGFJ6KJjK7TX6A,143091
+mwx/nutshell.py,sha256=FNQ5GgXVnjDu9mmf9dyxk1TmuICUXF9tLWL6o5CssQQ,143418
 mwx/testsuite.py,sha256=Zk75onPSEn2tf0swS3l-vIn6yTXGB7allIyvJsPHj20,1229
 mwx/utilus.py,sha256=ObXYWsDVn5DmjvwVQgP2HGAhrdxlDrwL7g9pMCDbU7U,38127
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
 mwx/wxpdb.py,sha256=ih2iLcOgYnUX849YXO4niIYue6amuoG7nWdpr-X1jFw,18839
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
-mwx/wxwit.py,sha256=1hHtMi2YEy2T_LnUpwdmrIdtCuvxMOFyykqnbq6jLP0,7294
+mwx/wxwit.py,sha256=PNgCNDGgT-AWjISOSfPQWyQSZ7JW3d8FyndptQw6OIY,7293
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
 mwx/plugins/ffmpeg_view.py,sha256=r7cQPe8anAWoIn3HU_YyWRpsTJrvzji97LNIO1Gw0e0,11031
 mwx/plugins/fft_view.py,sha256=08A_Y73XirV7kXpwf-v0mUA0Hr0MOfdMXv3tvL1hvWA,2789
@@ -22,7 +22,7 @@ mwx/plugins/frame_listview.py,sha256=gowjQ-ARNonMkDSXkQgPKq4U9YBJ-vQ0jK2krBVOdCs
 mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-1.4.11.dist-info/METADATA,sha256=IZXZTnCIPRB-B1eTwiGW6uD5IYtlmaNzMdgOs89Qpko,7382
-mwxlib-1.4.11.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-mwxlib-1.4.11.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.4.11.dist-info/RECORD,,
+mwxlib-1.4.15.dist-info/METADATA,sha256=th_Xs4HOK4txWRlzIGgFcMkWUJ6vO_ddbjfYFzN6COs,7382
+mwxlib-1.4.15.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+mwxlib-1.4.15.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.4.15.dist-info/RECORD,,

{mwxlib-1.4.11.dist-info → mwxlib-1.4.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any