mwxlib 1.3.11__py3-none-any.whl → 1.4.5__py3-none-any.whl

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.3.11"
+__version__ = "1.4.5"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -1420,7 +1420,7 @@ class ShellFrame(MiniFrame):
     
     def OnClose(self, evt):
         if self.debugger.busy:
-            if wx.MessageBox( # Confirm debugger close.
+            if wx.MessageBox( # Confirm closing the debugger.
                     "The debugger is running.\n\n"
                     "Enter [q]uit to exit before closing.\n"
                     "Continue closing?",
@@ -1441,7 +1441,7 @@ class ShellFrame(MiniFrame):
                 if buf.need_buffer_save:
                     self.popup_window(book)
                     buf.SetFocus()
-                    if wx.MessageBox( # Confirm close.
+                    if wx.MessageBox( # Confirm closing the buffer.
                             "You are closing unsaved content.\n\n"
                             "Changes to the content will be discarded.\n"
                             "Continue closing?",
@@ -1460,7 +1460,8 @@ class ShellFrame(MiniFrame):
         if not evt.Active:
             ## Reset autoload when active focus going outside.
             self.__autoload = True
-        elif evt.GetActivationReason() == evt.Reason_Mouse and self.__autoload:
+        ## elif evt.GetActivationReason() == evt.Reason_Mouse and self.__autoload:
+        elif self.__autoload:
             ## Check all buffers that need to be loaded.
             verbose = 1
             for book in self.get_all_editors():

mwx/graphman.py

@@ -152,32 +152,38 @@ class Thread:
             raise KeyboardInterrupt("terminated by user")
         return True
     
-    def pause(self, msg="Pausing..."):
+    def pause(self, msg=None, caption=wx.MessageBoxCaptionStr):
         """Pause the thread.
+        Confirm whether to terminate the thread.
         
-        Use ``check`` method where you want to pause.
+        Returns:
+            True  : [OK] if terminating.
+            False : [CANCEL] otherwise.
         
         Note:
+            Use ``check`` method where you want to pause.
             Even after the message dialog is displayed, the thread
             does not suspend until check (or event.wait) is called.
         """
         if not self.running:
             return None
-        if '\n\n' not in msg:
-            msg += '\n\n'
+        if not msg:
+            msg = ("The thread is running.\n\n"
+                   "Do you want to terminate the thread?")
         try:
             self.event.clear() # suspend
-            if wx.MessageBox(  # Confirm terminatation.
-                    msg + "Do you want to terminate the process?",
+            if wx.MessageBox(  # Confirm closing the thread.
+                    msg, caption,
                     style=wx.OK|wx.CANCEL|wx.ICON_WARNING) == wx.OK:
                 self.Stop()
-                return False
-            return True
+                return True
+            return False
         finally:
             self.event.set() # resume
     
     def Start(self, f, *args, **kwargs):
-        """Start the thread to run the specified function."""
+        """Start the thread to run the specified function.
+        """
         @wraps(f)
         def _f(*v, **kw):
             try:
@@ -186,12 +192,12 @@ class Thread:
             except BdbQuit:
                 pass
             except KeyboardInterrupt as e:
-                print("- Thread:execution stopped:", e)
+                print("- Thread execution stopped:", e)
             except AssertionError as e:
-                print("- Thread:execution failed:", e)
+                print("- Thread execution failed:", e)
             except Exception as e:
                 traceback.print_exc()
-                print("- Thread:exception:", e)
+                print("- Thread exception:", e)
                 self.handler('thread_error', self)
             finally:
                 self.active = 0
@@ -213,7 +219,10 @@ class Thread:
     def Stop(self):
         """Stop the thread.
         
-        Use ``check`` method where you want to quit.
+        Note:
+            Use ``check`` method where you want to stop.
+            Even after the message dialog is displayed, the thread
+            does not suspend until check (or event.wait) is called.
         """
         def _stop():
             with wx.BusyInfo("One moment please, "
@@ -428,7 +437,7 @@ class LayerInterface(CtrlInterface):
     def OnDestroy(self, evt):
         if evt.EventObject is self:
             if self.thread and self.thread.active:
-                self.thread.active = 0
+                ## self.thread.active = 0
                 self.thread.Stop()
             del self.Arts
         evt.Skip()
@@ -873,31 +882,28 @@ class Frame(mwx.Frame):
             elif ret == wx.ID_CANCEL:
                 evt.Veto()
                 return
-        for name in self.plugins:
-            plug = self.get_plug(name)
-            if plug.thread and plug.thread.active:
-                if wx.MessageBox( # Confirm thread close.
-                        "The thread is running.\n\n"
-                        "Enter [q]uit to exit before closing.\n"
-                        "Continue closing?",
-                        "Close {!r}".format(plug.Name),
-                        style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
-                    self.message("The close has been canceled.")
-                    evt.Veto()
-                    return
-                self.Quit()
-                break
-        for frame in self.graph.get_all_frames():
-            if frame.pathname is None:
-                if wx.MessageBox( # Confirm close.
-                        "You are closing unsaved frame.\n\n"
-                        "Continue closing?",
-                        "Close {!r}".format(frame.name),
-                        style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
-                    self.message("The close has been canceled.")
-                    evt.Veto()
-                    return
-                break
+        n = sum(bool(plug.thread and plug.thread.active)
+                for plug in (self.get_plug(name) for name in self.plugins))
+        if n:
+            s = 's' if n > 1 else ''
+            if wx.MessageBox( # Confirm closing the thread.
+                    f"Currently  running {n} thread{s}.\n\n"
+                    "Continue closing?",
+                    style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
+                self.message("The close has been canceled.")
+                evt.Veto()
+                return
+            self.Quit()
+        n = sum(frame.pathname is None for frame in self.graph.all_frames)
+        if n:
+            s = 's' if n > 1 else ''
+            if wx.MessageBox( # Confirm closing the frame.
+                    f"You are closing {n} unsaved frame{s}.\n\n"
+                     "Continue closing?",
+                    style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
+                self.message("The close has been canceled.")
+                evt.Veto()
+                return
         evt.Skip()
     
     def Destroy(self):
@@ -1377,7 +1383,7 @@ class Frame(mwx.Frame):
             plug = self.get_plug(name)
             thread = plug.thread  # Note: thread can be None or shared.
             if thread and thread.active:
-                thread.active = 0
+                ## thread.active = 0
                 thread.Stop()
     
     ## --------------------------------
@@ -1426,7 +1432,7 @@ class Frame(mwx.Frame):
         """
         view = self.selected_view
         if not frames:
-            frames = view.get_all_frames()
+            frames = view.all_frames
             if not frames:
                 return None
         
@@ -1692,7 +1698,7 @@ class Frame(mwx.Frame):
     def save_buffers_as_tiffs(self, path=None, frames=None):
         """Save buffers to a file as a multi-page tiff."""
         if not frames:
-            frames = self.selected_view.get_all_frames()
+            frames = self.selected_view.all_frames
             if not frames:
                 return None
         
@@ -1811,7 +1817,7 @@ class Frame(mwx.Frame):
             
             def _save(view):
                 name = view.Name
-                paths = [x.pathname for x in view.get_all_frames() if x.pathname]
+                paths = [x.pathname for x in view.all_frames if x.pathname]
                 o.write(f"self.{name}.unit = {view.unit:g}\n")
                 o.write(f"self.load_frame({paths!r}, self.{name})\n")
                 try:

mwx/matplot2g.py

@@ -783,9 +783,14 @@ class GraphPlot(MatplotPanel):
         else:
             return self.__Arts[j] # j:int -> frame
     
-    def get_all_frames(self):
+    def get_all_frames(self, j=None):
         """List of arts <matplotlib.image.AxesImage>."""
-        return self.__Arts
+        if j is None:
+            yield from self.__Arts
+        elif isinstance(j, str):
+            yield from (art for art in self.__Arts if j in art.name)
+        elif isinstance(j, np.ndarray):
+            yield from (art for art in self.__Arts if j is art.buffer)
     
     ## --------------------------------
     ## Property of frame / drawer
@@ -798,7 +803,7 @@ class GraphPlot(MatplotPanel):
     score_percentile = 0.005
     
     @property
-    def all_frames(self): # (deprecated) for backward compatibility
+    def all_frames(self):
         """List of arts <matplotlib.image.AxesImage>."""
         return self.__Arts
     

mwx/nutshell.py

@@ -28,10 +28,23 @@ from wx.py.editwindow import EditWindow
 
 from .utilus import funcall as _F
 from .utilus import ignore, typename
-from .utilus import split_words, split_paren, split_tokens, find_modules
+from .utilus import split_words, split_parts, split_tokens, find_modules
 from .framework import CtrlInterface, AuiNotebook, Menu
 
 
+## Monkey-patch for wx.py.introspect.getRoot with terminator '('.
+getRoot = introspect.getRoot
+def _getRoot(command, terminator=None):
+    """Return the rightmost root portion of an arbitrary Python command."""
+    if terminator == '(':
+        words = split_words(command, reverse=1)
+        for word in words:
+            if word == terminator:
+                return next(words, '')
+    return getRoot(command, terminator) # original
+introspect.getRoot = _getRoot
+
+
 ## URL pattern (flag = re.M | re.A)
 ## url_re = r"https?://[\w/:%#$&?()~.=+-]+"
 url_re = r"https?://[\w/:%#$&?!@~.,;=+-]+"  # excluding ()
@@ -210,8 +223,8 @@ class AutoCompInterfaceMixin:
             dispatcher.send(signal='Shell.calltip', sender=self, calltip=tip)
         p = self.cpos
         if argspec and insertcalltip:
-            self.AddText(argspec + ')')     # 挿入後のカーソル位置は変化しない
-            self.SetSelection(self.cpos, p) # selection back
+            self.AddText(argspec + ')')
+            self.cpos = p # selection backward to the point
         if tip:
             ## In case there isn't enough room, only go back to bol fallback.
             tippos = max(self.bol, p - len(name) - 1)
@@ -269,7 +282,7 @@ class AutoCompInterfaceMixin:
                     self.anchor = q
             with self.off_undocollection():
                 self.ReplaceSelection(word[n:])
-            self.cpos = p # backward selection to the point
+            self.cpos = p # selection backward to the point
             self.__comp_ind = j
         except IndexError:
             self.message("No completion words")
@@ -641,8 +654,8 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.IndicatorSetStyle(11, stc.STC_INDIC_STRAIGHTBOX)
         self.IndicatorSetForeground(11, "yellow")
         self.IndicatorSetUnder(11, True)
-        self.IndicatorSetAlpha(11, 0xe8)
-        self.IndicatorSetOutlineAlpha(11, 0)
+        ## self.IndicatorSetAlpha(11, 0xe8)
+        ## self.IndicatorSetOutlineAlpha(11, 0)
         
         self.IndicatorSetStyle(2, stc.STC_INDIC_DOTS)
         self.IndicatorSetForeground(2, "light gray")
@@ -863,7 +876,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         return sty
     
     def get_char(self, pos):
-        """Returns the character at the position."""
+        """Returns the character at the given position."""
         return chr(self.GetCharAt(pos))
     
     def get_text(self, start, end):
@@ -944,10 +957,12 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
             return topic
         with self.save_excursion():
             p = q = self.cpos
-            if self.get_char(p-1).isalnum():
+            ## if self.get_char(p-1).isidentifier():
+            if self.GetTextRange(self.PositionBefore(p), p).isidentifier():
                 self.WordLeft()
                 p = self.cpos
-            if self.get_char(q).isalnum():
+            ## if self.get_char(q).isidentifier():
+            if self.GetTextRange(q, self.PositionAfter(q)).isidentifier():
                 self.WordRightEnd()
                 q = self.cpos
             return self.GetTextRange(p, q)
@@ -1376,32 +1391,34 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     def grep(self, pattern, flags=re.M):
         yield from re.finditer(pattern.encode(), self.TextRaw, flags)
     
-    def search_text(self, text):
-        """Yields raw-positions where `text` is found."""
-        word = text.encode()
-        raw = self.TextRaw
+    def search_text(self, text, mode=True):
+        """Yields positions where `text` is found.
+        If mode is True, search by word; otherwise, search by string.
+        """
+        text = text.encode()
         pos = -1
+        p = re.compile(r"[a-zA-Z0-9_]")
         while 1:
-            pos = raw.find(word, pos+1)
+            pos = self.TextRaw.find(text, pos+1)
             if pos < 0:
                 break
+            if mode and p.search(self.get_char(pos-1) + self.get_char(pos+len(text))):
+                continue
             yield pos
     
-    def filter_text(self, text=None):
+    def filter_text(self):
         """Show indicators for the selected text."""
         self.__itextlines = []
         for i in (10, 11,):
             self.SetIndicatorCurrent(i)
             self.IndicatorClearRange(0, self.TextLength)
-        if text is None:
-            text = self.topic_at_caret
+        text = self.topic_at_caret
         if not text:
             self.message("No words")
             return
-        
         lw = len(text.encode()) # for multi-byte string
         lines = []
-        for p in self.search_text(text):
+        for p in self.search_text(text, mode=(not self.SelectedText)):
             lines.append(self.LineFromPosition(p))
             for i in (10, 11,):
                 self.SetIndicatorCurrent(i)
@@ -1833,12 +1850,8 @@ class Buffer(EditorInterface, EditWindow):
             self.message("")
         
         def clear_autocomp(evt):
-            ## """Clear autocomp, selection, and message."""
             if self.AutoCompActive():
                 self.AutoCompCancel()
-            if self.CanEdit():
-                with self.off_undocollection():
-                    self.ReplaceSelection("")
             self.message("")
         
         def fork(evt):
@@ -1882,7 +1895,7 @@ class Buffer(EditorInterface, EditWindow):
                     '* pressed' : (0, clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
-               'escape pressed' : (0, clear_autocomp),
+               'escape pressed' : (0, clear, skip),
                    'up pressed' : (2, skip, self.on_completion_backward),
                  'down pressed' : (2, skip, self.on_completion_forward),
                 '*left pressed' : (2, skip),
@@ -1909,7 +1922,7 @@ class Buffer(EditorInterface, EditWindow):
                     '* pressed' : (0, clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
-               'escape pressed' : (0, clear_autocomp),
+               'escape pressed' : (0, clear, skip),
                    'up pressed' : (3, skip, self.on_completion_backward),
                  'down pressed' : (3, skip, self.on_completion_forward),
                 '*left pressed' : (3, skip),
@@ -2099,8 +2112,15 @@ class Buffer(EditorInterface, EditWindow):
         if self.CallTipActive():
             self.CallTipCancel()
         
-        text = self.SelectedText or self.expr_at_caret
-        if text:
+        def _gen_text():
+            text = self.SelectedText
+            if text:
+                yield text
+            else:
+                yield self.line_at_caret
+                yield self.expr_at_caret
+        
+        for text in _gen_text():
             try:
                 obj = eval(text, self.globals, self.locals)
             except Exception as e:
@@ -2108,7 +2128,8 @@ class Buffer(EditorInterface, EditWindow):
             else:
                 self.CallTipShow(self.cpos, pformat(obj))
                 self.message(text)
-        else:
+                return
+        if not text:
             self.message("No words")
     
     def exec_region(self):
@@ -2216,7 +2237,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
     def OnPageClose(self, evt): #<wx._aui.AuiNotebookEvent>
         buf = self.GetPage(evt.Selection)
         if buf.need_buffer_save:
-            if wx.MessageBox( # Confirm close.
+            if wx.MessageBox( # Confirm closing the buffer.
                     "You are closing unsaved content.\n\n"
                     "The changes will be discarded.\n"
                     "Continue closing?",
@@ -2414,7 +2435,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         if not buf:
             buf = self.create_buffer("*temp file*")
         elif buf.need_buffer_save and verbose:
-            if wx.MessageBox( # Confirm load.
+            if wx.MessageBox( # Confirm loading the buffer.
                     "You are leaving unsaved content.\n\n"
                     "The changes will be discarded.\n"
                     "Continue loading?",
@@ -2468,7 +2489,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         buf = buf or self.buffer
         if buf.need_buffer_load and verbose:
             self.swap_buffer(buf)
-            if wx.MessageBox( # Confirm save.
+            if wx.MessageBox( # Confirm saving the buffer.
                     "The file has been modified externally.\n\n"
                     "The contents of the file will be overwritten.\n"
                     "Continue saving?",
@@ -2532,7 +2553,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         """Confirm the close with the dialog."""
         buf = buf or self.buffer
         if buf.need_buffer_save:
-            if wx.MessageBox( # Confirm close.
+            if wx.MessageBox( # Confirm closing the buffer.
                     "You are closing unsaved content.\n\n"
                     "The changes will be discarded.\n"
                     "Continue closing?",
@@ -2545,7 +2566,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
     def kill_all_buffers(self):
         for buf in self.get_all_buffers():
             if buf.need_buffer_save:
-                if wx.MessageBox( # Confirm close.
+                if wx.MessageBox( # Confirm closing the buffer.
                         "You are closing unsaved content.\n\n"
                         "The changes will be discarded.\n"
                         "Continue closing?",
@@ -2610,22 +2631,6 @@ class Interpreter(interpreter.Interpreter):
             self.parent.handler('interp_error', v)
         except AttributeError:
             pass
-    
-    @ignore(DeprecationWarning)
-    def getCallTip(self, command='', *args, **kwargs):
-        """Return call tip text for a command.
-        
-        (override) Ignore DeprecationWarning: for function,
-                   `formatargspec` is deprecated since Python 3.5.
-        (override) Ignore ValueError: no signature found for builtin
-                   if the unwrapped function is a builtin function.
-        """
-        ## In 4.2.1, DeprecationWarning was fixed.
-        ## In 4.2.2, ValueError was fixed.
-        try:
-            return interpreter.Interpreter.getCallTip(self, command, *args, **kwargs)
-        except ValueError:
-            return interpreter.Interpreter.getCallTip(self) # dummy
 
 
 class Nautilus(EditorInterface, Shell):
@@ -2796,12 +2801,8 @@ class Nautilus(EditorInterface, Shell):
             self.message("")
         
         def clear_autocomp(evt):
-            ## """Clear autocomp, selection, and message."""
             if self.AutoCompActive():
                 self.AutoCompCancel()
-            if self.CanEdit():
-                with self.off_undocollection():
-                    self.ReplaceSelection("")
             self.message("")
         
         def fork(evt):
@@ -2900,7 +2901,7 @@ class Nautilus(EditorInterface, Shell):
                     '* pressed' : (0, clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
-               'escape pressed' : (0, clear_autocomp),
+               'escape pressed' : (0, clear, skip),
                    'up pressed' : (2, skip, self.on_completion_backward),
                  'down pressed' : (2, skip, self.on_completion_forward),
                 '*left pressed' : (2, skip),
@@ -2928,7 +2929,7 @@ class Nautilus(EditorInterface, Shell):
                     '* pressed' : (0, clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
-               'escape pressed' : (0, clear_autocomp),
+               'escape pressed' : (0, clear, skip),
                    'up pressed' : (3, skip, self.on_completion_backward),
                  'down pressed' : (3, skip, self.on_completion_forward),
                 '*left pressed' : (3, skip),
@@ -2956,7 +2957,7 @@ class Nautilus(EditorInterface, Shell):
                     '* pressed' : (0, clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
-               'escape pressed' : (0, clear_autocomp),
+               'escape pressed' : (0, clear, skip),
                    'up pressed' : (4, skip, self.on_completion_backward),
                  'down pressed' : (4, skip, self.on_completion_forward),
                 '*left pressed' : (4, skip),
@@ -2984,7 +2985,7 @@ class Nautilus(EditorInterface, Shell):
                     '* pressed' : (0, clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
-               'escape pressed' : (0, clear_autocomp),
+               'escape pressed' : (0, clear, skip),
                    'up pressed' : (5, skip, self.on_completion_backward),
                  'down pressed' : (5, skip, self.on_completion_forward),
                 '*left pressed' : (5, skip),
@@ -3135,7 +3136,7 @@ class Nautilus(EditorInterface, Shell):
         rst = self.get_style(p)
         if p == self.bolc:
             self.ReplaceSelection('self') # replace [.] --> [self.]
-        elif st in ('nil', 'space', 'op', 'sep', 'lparen'):
+        elif st in ('space', 'sep', 'lparen'):
             self.ReplaceSelection('self')
         elif st not in ('moji', 'word', 'rparen') or rst == 'word':
             self.handler('quit', evt) # don't enter autocomp
@@ -3238,16 +3239,21 @@ class Nautilus(EditorInterface, Shell):
                 ## func(a,b,c) @debug --> func,a,b,c @debug
                 if rhs in ("debug", "profile", "timeit"):
                     if lhs[-1] in ')':
-                        L, R = split_paren(lhs, reverse=1)
+                        R = next(split_parts(lhs, reverse=1))
+                        L = lhs[:-len(R)]
                         if not L:
                             lhs = "{!r}".format(R[1:-1])
-                        elif R:
+                        else:
                             lhs = "{}, {}".format(L, R[1:-1])
                 
                 ## @(y1,,,yn) --> @partial(y1,,,yn)
                 elif rhs.startswith('('):
                     rhs = re.sub(r"^\((.*)\)", r"partial(\1)", rhs, flags=re.S)
                 
+                ## obj @.method --> (obj).method
+                elif rhs.startswith('.'):
+                    return self.magic_interpret([f"({lhs}){rhs}"] + rest)
+                
                 return self.magic_interpret([f"{rhs}({lhs})"] + rest)
             
             if c == '`':
@@ -3516,7 +3522,7 @@ class Nautilus(EditorInterface, Shell):
     def write(self, text, pos=None):
         """Display text in the shell.
         
-        (override) Append text if it is writable at the position.
+        (override) Append text if it is writable at the given position.
         """
         if pos is not None:
             if pos < 0:
@@ -3603,22 +3609,20 @@ class Nautilus(EditorInterface, Shell):
     ## Autocomp actions of the shell
     ## --------------------------------
     
-    def autoCallTipShow(self, command, insertcalltip=True, forceCallTip=False):
-        """Display argument spec and docstring in a popup window.
-        
-        (override) Swap anchors to not scroll to the end of the line.
-        """
-        Shell.autoCallTipShow(self, command, insertcalltip, forceCallTip)
-        self.cpos, self.anchor = self.anchor, self.cpos
-        self.EnsureCaretVisible()
-    
     def eval_line(self):
         """Evaluate the selected word or line."""
         if self.CallTipActive():
             self.CallTipCancel()
         
-        text = self.SelectedText or self.expr_at_caret
-        if text:
+        def _gen_text():
+            text = self.SelectedText
+            if text:
+                yield text
+            else:
+                yield self.line_at_caret
+                yield self.expr_at_caret
+        
+        for text in _gen_text():
             tokens = split_words(text)
             try:
                 cmd = self.magic_interpret(tokens)
@@ -3629,7 +3633,8 @@ class Nautilus(EditorInterface, Shell):
             else:
                 self.CallTipShow(self.cpos, pformat(obj))
                 self.message(cmd)
-        else:
+                return
+        if not text:
             self.message("No words")
     
     def exec_region(self):

mwx/utilus.py

@@ -283,24 +283,28 @@ if pp:
         pp.sort_dicts = True
 
 
-def split_paren(text, reverse=False):
-    """Split text into a head parenthesis and the rest, including the tail.
-    If reverse is True, search from tail to head.
+def split_words(text, reverse=False):
+    """Generates words (python phrase) extracted from text.
+    If reverse is True, process from tail to head.
     """
     tokens = list(split_tokens(text))
     if reverse:
         tokens = tokens[::-1]
-    words = _extract_paren_from_tokens(tokens, reverse)
-    paren = ''.join(reversed(words) if reverse else words)
-    rest = ''.join(reversed(tokens) if reverse else tokens)
-    if reverse:
-        return rest, paren
-    else:
-        return paren, rest
+    while tokens:
+        words = []
+        while 1:
+            word = _extract_words_from_tokens(tokens, reverse)
+            if not word:
+                break
+            words += word
+        if words:
+            yield ''.join(reversed(words) if reverse else words)
+        if tokens:
+            yield tokens.pop(0) # sep-token
 
 
-def split_words(text, reverse=False):
-    """Generates words extracted from text.
+def split_parts(text, reverse=False):
+    """Generates portions (words and parens) extracted from text.
     If reverse is True, process from tail to head.
     """
     tokens = list(split_tokens(text))
@@ -345,10 +349,6 @@ def split_tokens(text, comment=True):
 def _extract_words_from_tokens(tokens, reverse=False):
     """Extracts pythonic expressions from tokens.
     
-    Extraction continues until the parenthesis is closed
-    and the following token starts with a char in sep, where
-    the sep includes `@, ops, delims, and whitespaces, etc.
-    
     Returns:
         A token list extracted including the parenthesis.
         If reverse is True, the order of the tokens will be reversed.
@@ -372,45 +372,16 @@ def _extract_words_from_tokens(tokens, reverse=False):
         elif not stack and c[0] in sep: # ok; starts with a char in sep
             break
         words.append(c)
-    else: # if stack: error("unclosed-paren")
+        if not stack: # ok
+            j += 1 # to remove current token
+            break
+    else:
+        ## if stack: error("unclosed-paren")
         j = None
     del tokens[:j] # remove extracted tokens (except the last one)
     return words
 
 
-def _extract_paren_from_tokens(tokens, reverse=False):
-    """Extracts parenthesis from tokens.
-    
-    The first token must be a parenthesis.
-    Returns:
-        A token list extracted including the parenthesis,
-        or an empty list if the parenthesis is not closed.
-        If reverse is True, the order of the tokens will be reversed.
-    """
-    p, q = "({[", ")}]"
-    if reverse:
-        p, q = q, p
-    stack = []
-    words = []
-    for j, c in enumerate(tokens):
-        if not c:
-            continue
-        if c in p:
-            stack.append(c)
-        elif c in q:
-            if not stack: # error("open-paren")
-                break
-            if c != q[p.index(stack.pop())]: # error("mismatch-paren")
-                break
-        elif j == 0:
-            break # first char is not paren
-        words.append(c)
-        if not stack: # ok
-            del tokens[:j+1] # remove extracted tokens
-            return words
-    return [] # error("unclosed-paren")
-
-
 def walk_packages_no_import(path=None, prefix=''):
     """Yields module info recursively for all submodules on path.
     If path is None, yields all top-level modules on sys.path.
@@ -979,26 +950,44 @@ class TreeList:
 
 
 def get_fullargspec(f):
-    argv = []
-    defaults = {}
-    varargs = None
-    varkwargs = None
-    kwonlyargs = []
-    kwonlydefaults = {}
+    """Get the names and default values of a callable object's parameters.
+    If the object is a built-in function, it tries to get argument
+    information from the docstring. If it fails, it returns None.
+    
+    Returns:
+        args            : a list of the parameter names.
+        varargs         : the name of the  * parameter or None.
+        varkwargs       : the name of the ** parameter or None.
+        defaults        : a dict mapping names from args to defaults.
+        kwonlyargs      : a list of keyword-only parameter names.
+        kwonlydefaults  : a dict mapping names from kwonlyargs to defaults.
+    
+    Note:
+        `self` parameter is not reported for bound methods.
+    
+    cf. inspect.getfullargspec
+    """
+    argv = []           # <before /> 0:POSITIONAL_ONLY
+                        # <before *> 1:POSITIONAL_OR_KEYWORD
+    varargs = None      # <*args>    2:VAR_POSITIONAL
+    varkwargs = None    # <**kwargs> 4:VAR_KEYWORD
+    defaults = {}       # 
+    kwonlyargs = []     # <after *>  3:KEYWORD_ONLY
+    kwonlydefaults = {} # 
     try:
         sig = inspect.signature(f)
         for k, v in sig.parameters.items():
-            if v.kind <= 1: # POSITIONAL_ONLY / POSITIONAL_OR_KEYWORD
+            if v.kind in (v.POSITIONAL_ONLY, v.POSITIONAL_OR_KEYWORD):
                 argv.append(k)
                 if v.default != v.empty:
                     defaults[k] = v.default
-            elif v.kind == 2: # VAR_POSITIONAL (*args)
+            elif v.kind == v.VAR_POSITIONAL:
                 varargs = k
-            elif v.kind == 3: # KEYWORD_ONLY
+            elif v.kind == v.KEYWORD_ONLY:
                 kwonlyargs.append(k)
                 if v.default != v.empty:
                     kwonlydefaults[k] = v.default
-            elif v.kind == 4: # VAR_KEYWORD (**kwargs)
+            elif v.kind == v.VAR_KEYWORD:
                 varkwargs = k
     except ValueError:
         ## Builtin functions don't have an argspec that we can get.
@@ -1009,19 +998,33 @@ def get_fullargspec(f):
         ## 
         ## ...(details)...
         ## ```
-        docs = [ln for ln in inspect.getdoc(f).splitlines() if ln]
-        m = re.search(r"(\w+)\((.*)\)", docs[0])
-        if m:
-            ## Note: Cannot process args containing commas.
-            ## e.g., v='Hello, world"
+        doc = inspect.getdoc(f)
+        if doc is None:
+            return None
+        m = re.match(r"(\w+)\s*\((.*?)\)", doc.strip(), re.S)
+        if not m:
+            return None
+        else:
             name, argspec = m.groups()
-            for v in argspec.strip().split(','):
-                m = re.search(r"(\w+)", v)
+            argparts = ['']
+            for part in split_parts(argspec): # Separate argument parts with commas.
+                if not part.strip():
+                    continue
+                if part != ',':
+                    argparts[-1] += part
+                else:
+                    argparts.append('')
+            for v in argparts:
+                m = re.match(r"(\w+):?", v) # argv + kwonlyargs
                 if m:
                     argv.append(m.group(1))
-            defaults = dict(re.findall(r"(\w+)\s*=\s*([\w' ]+)", argspec))
-        else:
-            return None
+                    m = re.match(r"(\w+)(?::\w+)?=(.+)", v) # defaults + kwonlydefaults
+                    if m:
+                        defaults.update([m.groups()])
+                elif v.startswith('**'): # <**kwargs>
+                    varkwargs = v[2:]
+                elif v.startswith('*'): # <*args>
+                    varargs = v[1:]
     return (argv, varargs, varkwargs,
             defaults, kwonlyargs, kwonlydefaults)
 
@@ -1038,10 +1041,10 @@ def funcall(f, *args, doc=None, alias=None, **kwargs):
         >>> Act1 = lambda *v,**kw: f(*(v+args), **(kwargs|kw))
         >>> Act2 = lambda *v,**kw: f(*args, **(kwargs|kw))
         
-        Returns Act1 (accepts event arguments) if event arguments
+        `Act1` is returned (accepts event arguments) if event arguments
         cannot be omitted or if there are any remaining arguments
         that must be explicitly specified.
-        Otherwise, returns Act2 (ignores event arguments).
+        Otherwise, `Act2` is returned (ignores event arguments).
     """
     assert callable(f)
     assert isinstance(doc, (str, type(None)))
@@ -1062,6 +1065,7 @@ def funcall(f, *args, doc=None, alias=None, **kwargs):
         (argv, varargs, varkwargs, defaults,
             kwonlyargs, kwonlydefaults) = get_fullargspec(f)
     except Exception:
+        warn(f"Failed to get the signature of {f}.")
         return f
     if not varargs:
         N = len(argv)

{mwxlib-1.3.11.dist-info → mwxlib-1.4.5.dist-info}/METADATA

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

{mwxlib-1.3.11.dist-info → mwxlib-1.4.5.dist-info}/RECORD

@@ -1,16 +1,16 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=MXjrm_ryRGHvOFKu8wb10qz_oka70xW2yFbYjBMYfns,8140
 mwx/controls.py,sha256=RssTROprNfgnRMiWVOoSSd8Fy0qwZ8DCrYM2f5Wgr4E,48610
-mwx/framework.py,sha256=9H26L5rF3rxpBm0wInvt3oNhB9si6xNR-K5PbIoVx5c,76778
-mwx/graphman.py,sha256=qA_tNq_9A5eNuujzmxha8ponAIQxZmMtJQkRkojuVYo,70398
+mwx/framework.py,sha256=DO2VrF_SOS6Gdr22PZclHChWr2oRQfW__7-1xxr97Cc,76830
+mwx/graphman.py,sha256=_8_DaG3qhhZByoh5wboyYQlAsm7GlPoR8wT-RNMx4Cw,70627
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
 mwx/matplot2.py,sha256=Htwegq6N5G7oKSRCuajik5Dixd93i8PKVbkL7Azy99M,33150
-mwx/matplot2g.py,sha256=H1PeLJk5P0KKMT6tmocpli5RSPNjnteA5GhbJTKEqIg,64869
+mwx/matplot2g.py,sha256=4BBHlvfhg1796hu1nTCsTA82YRkZhwUnfcHCBf5ZGO8,65083
 mwx/matplot2lg.py,sha256=cb0EZXivccDQu4oFj5ddSUF9pEE4f5UuFJJK2ELItww,27404
 mwx/mgplt.py,sha256=8mXbHpCmm7lz3XbAxOg7IVC7DaSGBEby1UfTlMl9kjk,5604
-mwx/nutshell.py,sha256=XrPBcOCeUbnKi5-JjlpmZinkIJINimNsS82SXRxfv_s,142391
+mwx/nutshell.py,sha256=4GDfGCHvHptpLqJIUVAfCMyI6V2KFcgji8S0PWMviL0,142385
 mwx/testsuite.py,sha256=Zk75onPSEn2tf0swS3l-vIn6yTXGB7allIyvJsPHj20,1229
-mwx/utilus.py,sha256=bDeooo2bOcZwvkIdi0ElkT-qoblqzHNFsIveb72NFOo,37528
+mwx/utilus.py,sha256=iAqtDbkVuFsSuS71leUd-mHH0ETRQ3GLnII7O2wcw3I,38065
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
 mwx/wxpdb.py,sha256=ih2iLcOgYnUX849YXO4niIYue6amuoG7nWdpr-X1jFw,18839
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
@@ -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.3.11.dist-info/METADATA,sha256=q5aFmjTSmVGQcb9lCf1xvhagruldOzi0LgMAJi3yClI,7434
-mwxlib-1.3.11.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mwxlib-1.3.11.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.3.11.dist-info/RECORD,,
+mwxlib-1.4.5.dist-info/METADATA,sha256=004S_ou1NJHL8BynaX391SwQ5vamthk4oifMNz8yUrE,7433
+mwxlib-1.4.5.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+mwxlib-1.4.5.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.4.5.dist-info/RECORD,,

{mwxlib-1.3.11.dist-info → mwxlib-1.4.5.dist-info}/WHEEL

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