mwxlib 0.92.0__py3-none-any.whl → 0.92.4__py3-none-any.whl

mwx/bookshelf.py

@@ -123,9 +123,9 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface, TreeList):
                 data = rest[0]
                 data._itemId = item
                 self.SetItemData(item, data)
-                if (buf := data.buffer):
-                    self.SetItemText(item, buf.caption_prefix + buf.name)
-            except Exception:
+                buf = data.buffer
+                self.SetItemText(item, buf.caption_prefix + buf.name)
+            except AttributeError:
                 pass
         for branch in branches:
             self._set_item(item, *branch)

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.92.0"
+__version__ = "0.92.4"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -491,7 +491,7 @@ def pack(self, items, orient=wx.HORIZONTAL, style=None, label=None):
             traceback.print_exc()
             bmp = wx.StaticBitmap(self,
                     bitmap=wx.ArtProvider.GetBitmap(wx.ART_ERROR))
-            bmp.SetToolTip("Pack failure\n{}".format(e))
+            bmp.SetToolTip(str(e))
             sizer.Add(bmp, 0, wx.EXPAND | wx.ALL, 0)
             wx.Bell()
     return sizer
@@ -852,8 +852,9 @@ class AuiNotebook(aui.AuiNotebook):
             wnd = wx.Window.FindFocus() # original focus
             org = self.CurrentPage
             if j != self.Selection:
-                self.Selection = j # the focus is moved
-            if wnd and wnd is not org: # restore focus other window
+                self.Selection = j      # focus moved if shown
+            self.CurrentPage.SetFocus() # reset focus
+            if wnd and wnd is not org:  # restore focus other window
                 wnd.SetFocus()
     
     def get_caption(self, win):
@@ -962,7 +963,7 @@ class AuiNotebook(aui.AuiNotebook):
             self._mgr.LoadPerspective(frames)
             self._mgr.Update()
         except Exception as e:
-            print("- Failed to load perspective: {}".format(e))
+            print(f"- Failed to load perspective: {e}")
             pass
         finally:
             self.Parent.Thaw()
@@ -1060,7 +1061,7 @@ class ShellFrame(MiniFrame):
         self.__standalone = bool(ensureClose)
         
         ## Initialize self-specific builtins.
-        ## Note: This should be called before creating rootshell.
+        ## Note: This should be called before creating root shell.
         self.Init()
         
         from .nutshell import Nautilus, EditorBook
@@ -1107,8 +1108,8 @@ class ShellFrame(MiniFrame):
         
         self.ghost = AuiNotebook(self, size=(600,400))
         self.ghost.AddPage(self.Scratch, "Scratch")
-        self.ghost.AddPage(self.Log,     "Log")
-        self.ghost.AddPage(self.Help,    "Help")
+        self.ghost.AddPage(self.Log, "Log")
+        self.ghost.AddPage(self.Help, "Help")
         self.ghost.Name = "ghost"
         
         self.Bookshelf = EditorTreeCtrl(self, name="Bookshelf",
@@ -1248,12 +1249,9 @@ class ShellFrame(MiniFrame):
         self.Log.set_attributes(ReadOnly=True)
         self.Help.set_attributes(ReadOnly=True)
         
-        msg = "#! Opened: <{}>\r\n".format(datetime.datetime.now())
-        self.add_log(msg)
-        
         self.load_session(
             os.path.abspath(debrc) if debrc else self.SESSION_FILE)
-    
+        
     SESSION_FILE = get_rootpath(".debrc")
     SCRATCH_FILE = get_rootpath("scratch.py")
     LOGGING_FILE = get_rootpath("deb-logging.log")
@@ -1271,7 +1269,10 @@ class ShellFrame(MiniFrame):
         
         if flush:
             for book in self.all_books:
-                book.delete_all_buffers()
+                book.delete_all_buffers() # Note: *log* is also flushed.
+        
+        msg = "#! Opened: <{}>\r\n".format(datetime.datetime.now())
+        self.add_log(msg)
         
         def _fload(editor, filename):
             try:
@@ -1317,7 +1318,7 @@ class ShellFrame(MiniFrame):
                 pass
         
         _fsave(self.Scratch, self.SCRATCH_FILE) # save scratch
-        _fsave(self.Log,     self.LOGGING_FILE)
+        _fsave(self.Log,     self.LOGGING_FILE) # save log
         
         with open(self.SESSION_FILE, 'w', encoding='utf-8', newline='') as o:
             o.write("#! Session file (This file is generated automatically)\n")
@@ -1365,10 +1366,7 @@ class ShellFrame(MiniFrame):
     
     def Destroy(self):
         try:
-            self.timer.Stop()
-            self.save_session()
-            
-            ## Remove built-in methods
+            ## Remove built-in self methods
             del builtins.info
             del builtins.help
             del builtins.load
@@ -1378,6 +1376,11 @@ class ShellFrame(MiniFrame):
             del builtins.timeit
             del builtins.profile
             del builtins.highlight
+        except AttributeError:
+            pass
+        try:
+            self.timer.Stop()
+            self.save_session()
         finally:
             self._mgr.UnInit()
             return MiniFrame.Destroy(self)
@@ -1514,15 +1517,13 @@ class ShellFrame(MiniFrame):
                 "Version: {!s}".format(__version__),
                 self.__class__.__doc__,
                 self.rootshell.__class__.__doc__,
-                
-                # Thanks to wx.py.shell.
+                ## Thanks to wx.py.shell.
                 "#{!r}".format(wx.py),
                 "Author: {!r}".format(wx.py.version.__author__),
                 "Version: {!s}".format(wx.py.version.VERSION),
                 wx.py.shell.Shell.__doc__,
                 textwrap.indent("*original" + wx.py.shell.HELP_TEXT, ' '*4),
-                
-                # Thanks are also due to wxWidgets.
+                ## Thanks are also due to wx.
                 "#{!r}".format(wx),
                 "To show the credit, press C-M-Mbutton.\n",
                 ))
@@ -1684,39 +1685,35 @@ class ShellFrame(MiniFrame):
     ## Note: history に余計な文字列が入らないようにする
     @postcall
     def debug(self, obj, *args, **kwargs):
-        if isinstance(obj, type(print)):
-            wx.MessageBox("Unable to debug builtin functions.\n\n"
-                          "Target must be callable or wx.Object.",
-                          style=wx.ICON_ERROR)
-        elif callable(obj):
-            try:
-                shell = self.debugger.interactive_shell
-                self.debugger.interactive_shell = self.current_shell
-                self.debugger.editor = self.Log # set default logger
+        shell = self.debugger.interactive_shell
+        self.debugger.interactive_shell = self.current_shell
+        try:
+            if isinstance(obj, type(print)):
+                wx.MessageBox("Unable to debug builtin functions.\n\n"
+                              "Target must be callable or wx.Object.",
+                              style=wx.ICON_ERROR)
+            elif callable(obj):
                 self.debugger.debug(obj, *args, **kwargs)
-            finally:
-                self.debugger.interactive_shell = shell
-        elif isinstance(obj, str):
-            try:
-                shell = self.debugger.interactive_shell
-                self.debugger.interactive_shell = self.current_shell
-                self.debugger.editor = self.Log # set default logger
+            elif isinstance(obj, str):
                 filename = "<string>"
-                buf = self.Log.find_buffer(filename) or self.Log.create_buffer(filename)
+                buf = self.Scratch.find_buffer(filename)\
+                  or self.Scratch.create_buffer(filename)
                 with buf.off_readonly():
                     buf.Text = obj
-                self.debugger.run(obj)
-            finally:
-                self.debugger.interactive_shell = shell
-        elif isinstance(obj, wx.Object):
-            self.watch(obj)
-        else:
-            wx.MessageBox("Unable to debug non-callable objects.\n\n"
-                          "Target must be callable or wx.Object.",
-                          style=wx.ICON_ERROR)
+                self.debugger.run(obj, filename)
+            elif isinstance(obj, wx.Object):
+                self.watch(obj)
+            else:
+                wx.MessageBox("Unable to debug non-callable objects.\n\n"
+                              "Target must be callable or wx.Object.",
+                              style=wx.ICON_ERROR)
+        finally:
+            self.debugger.interactive_shell = shell
     
     def on_debug_begin(self, frame):
         """Called before set_trace."""
+        if not self:
+            return
         shell = self.debugger.interactive_shell
         shell.write("#<-- Enter [n]ext to continue.\n", -1)
         shell.prompt()
@@ -1729,6 +1726,8 @@ class ShellFrame(MiniFrame):
     
     def on_debug_next(self, frame):
         """Called from cmdloop."""
+        if not self:
+            return
         shell = self.debugger.interactive_shell
         shell.globals = gs = frame.f_globals
         shell.locals = ls = frame.f_locals
@@ -1748,6 +1747,8 @@ class ShellFrame(MiniFrame):
     
     def on_debug_end(self, frame):
         """Called after set_quit."""
+        if not self:
+            return
         shell = self.debugger.interactive_shell
         shell.write("#--> Debugger closed successfully.\n", -1)
         shell.prompt()
@@ -1830,9 +1831,10 @@ class ShellFrame(MiniFrame):
             ## Set a marker on the current line.
             buf.add_marker(buf.cline, 1 if noerr else 2) # 1:white 2:red-arrow
             return
+        
         ## Logging text every step in case of crash.
-        with open(self.LOGGING_FILE, 'a', encoding='utf-8', newline='') as o:
-            o.write(text)
+        ## with open(self.LOGGING_FILE, 'a', encoding='utf-8', newline='') as o:
+        ##     o.write(text)
     
     def add_help(self, text):
         """Add text to the help buffer."""
@@ -1841,7 +1843,6 @@ class ShellFrame(MiniFrame):
             buf.SetText(text)
         ## Overwrite text and popup the window.
         self.popup_window(self.Help, focus=0)
-        self.Help.swap_page(buf)
     
     def clone_shell(self, target):
         if not hasattr(target, '__dict__'):
@@ -1860,6 +1861,10 @@ class ShellFrame(MiniFrame):
         if shell is self.rootshell:
             ## self.message("- Don't close the root shell.")
             return
+        if self.debugger.busy and shell is self.debugger.interactive_shell:
+            wx.MessageBox("The debugger is running.\n\n"
+                          "Enter [q]uit to exit before closing.")
+            return
         j = self.console.GetPageIndex(shell)
         if j != -1:
             self.console.DeletePage(j) # Destroy the window
@@ -1873,10 +1878,15 @@ class ShellFrame(MiniFrame):
         yield from self.console.get_pages(type)
         yield from self.ghost.get_pages(type)
     
+    @property
+    def all_shells(self):
+        """Yields all books in the notebooks."""
+        yield from self.console.get_pages(type(self.rootshell))
+    
     @property
     def all_books(self):
         """Yields all books in the notebooks."""
-        yield from self.get_all_pages(type(self.Log))
+        yield from self.ghost.get_pages(type(self.Log))
     
     @property
     def current_shell(self):

mwx/graphman.py

@@ -274,31 +274,29 @@ class LayerInterface(CtrlInterface):
         self.__artists = []
     
     def attach_artists(self, axes, *artists):
-        """Attach artists (e.g., patches) to the given axes.
-        If axes is None, they will be removed from the axes.
-        """
-        if not artists:
-            artists = self.Arts[:]
-        if axes:
-            for art in artists:
-                if art.axes and art.axes is not axes:
-                    art.remove()
-                    art._transformSet = False
-                axes.add_artist(art)
-                if art not in self.Arts:
-                    self.Arts.append(art)
-        else:
-            for art in artists:
-                if art.axes:
-                    art.remove()
-                    art._transformSet = False
-                self.Arts.remove(art)
+        """Attach artists (e.g., patches) to the given axes."""
+        for art in artists:
+            if art.axes and art.axes is not axes:
+                art.remove()
+                art._transformSet = False
+            axes.add_artist(art)
+            if art not in self.__artists:
+                self.__artists.append(art)
+    
+    def detach_artists(self, *artists):
+        """Detach artists (e.g., patches) from their axes."""
+        for art in artists:
+            if art.axes:
+                art.remove()
+                art._transformSet = False
+            self.__artists.remove(art)
     
     def __init__(self, parent, session=None):
         CtrlInterface.__init__(self)
         
         self.parent = parent
         self.__artists = []
+        
         self.parameters = None # => reset
         
         def copy_params(**kwargs):
@@ -1172,7 +1170,7 @@ class Frame(mwx.Frame):
         except (AttributeError, NameError) as e:
             traceback.print_exc()
             wx.CallAfter(wx.MessageBox,
-                         "{}\n\n{}".format(e, traceback.format_exc()),
+                         "{}\n\n".format(e) + traceback.format_exc(),
                          "Error in loading {!r}".format(module.__name__),
                          style=wx.ICON_ERROR)
             return False
@@ -1189,7 +1187,7 @@ class Frame(mwx.Frame):
         except Exception as e:
             traceback.print_exc()
             wx.CallAfter(wx.MessageBox,
-                         "{}\n\n{}".format(e, traceback.format_exc()),
+                         "{}\n\n".format(e) + traceback.format_exc(),
                          "Error in loading {!r}".format(name),
                          style=wx.ICON_ERROR)
             return False
@@ -1302,7 +1300,7 @@ class Frame(mwx.Frame):
         except Exception as e:
             traceback.print_exc()
             wx.CallAfter(wx.MessageBox,
-                         "{}\n\n{}".format(e, traceback.format_exc()),
+                         "{}\n\n".format(e) + traceback.format_exc(),
                          "Error in unloading {!r}".format(name),
                          style=wx.ICON_ERROR)
             return False
@@ -1609,7 +1607,8 @@ class Frame(mwx.Frame):
                     for j in range(n):
                         self.message("Loading {!r} [{} of {} pages]...".format(fn, j+1, n))
                         buf.seek(j)
-                        frame = view.load(buf, f"{j:0{d}}-{fn}", show=0)
+                        name = "{:0{d}}-{}".format(j, fn, d=d)
+                        frame = view.load(buf, name, show=0)
                 else:
                     frame = view.load(buf, fn, show=0, pathname=path, **info)
                     frames.append(frame)

mwx/matplot2g.py

@@ -943,7 +943,7 @@ class GraphPlot(MatplotPanel):
                 xo, yo = min(nx), min(ny) # top-left
                 xr, yr = max(nx), max(ny) # bottom-right
                 self.message("[Region] "
-                    "crop={0}:{1}:{2}:{3}".format(xr-xo, yr-yo, xo, yo)) # (W:H:left:top)
+                    "crop={}:{}:{}:{}".format(xr-xo, yr-yo, xo, yo)) # (W:H:left:top)
             else:
                 return self.trace_point(x[[0,-1]], y[[0,-1]], type)
     

mwx/nutshell.py

@@ -245,7 +245,7 @@ class EditorInterface(CtrlInterface):
         self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_VLINE, *v)
         self.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_VLINE, *v)
         
-        ## Custom indicator [0,1] for filter_text
+        ## Custom indicator (0,1) for filter_text
         ## if wx.VERSION >= (4,1,0):
         try:
             self.IndicatorSetStyle(0, stc.STC_INDIC_TEXTFORE)
@@ -260,7 +260,7 @@ class EditorInterface(CtrlInterface):
         self.IndicatorSetForeground(0, "red")
         self.IndicatorSetForeground(1, "yellow")
         
-        ## Custom indicator [2] for match_paren
+        ## Custom indicator (2) for URL (buffer_modified)
         self.IndicatorSetStyle(2, stc.STC_INDIC_DOTS)
         self.IndicatorSetForeground(2, "light gray")
         try:
@@ -269,6 +269,10 @@ class EditorInterface(CtrlInterface):
         except AttributeError:
             pass
         
+        ## Custom indicator (3) for match_paren
+        self.IndicatorSetStyle(3, stc.STC_INDIC_DOTS)
+        self.IndicatorSetForeground(3, "light gray")
+        
         ## Custom annotation
         self.AnnotationSetVisible(stc.STC_ANNOTATION_BOXED)
         
@@ -283,6 +287,7 @@ class EditorInterface(CtrlInterface):
         self.IndentationGuides = stc.STC_IV_LOOKFORWARD
         
         self.__mark = -1
+        self.__stylus = {}
     
     ## Custom constants embedded in stc
     stc.STC_P_WORD3 = 20
@@ -768,12 +773,17 @@ class EditorInterface(CtrlInterface):
     ## Preferences / Appearance
     ## --------------------------------
     
-    def set_style(self, spec=None, **kwargs):
+    def get_stylus(self):
+        return self.__stylus
+    
+    def set_stylus(self, spec=None, **kwargs):
         spec = spec and spec.copy() or {}
         spec.update(kwargs)
         if not spec:
             return
         
+        self.__stylus.update(spec)
+        
         def _map(sc):
             return dict(kv.partition(':')[::2] for kv in sc.split(',') if kv)
         
@@ -815,7 +825,7 @@ class EditorInterface(CtrlInterface):
             if 'bold' in item:
                 self.SetCaretStyle(stc.STC_CARETSTYLE_BLOCK)
         
-        ## Custom indicator for search-word
+        ## Custom indicator (0,1) for filter_text
         item = _map(spec.pop(stc.STC_P_WORD3, ''))
         if item:
             self.IndicatorSetForeground(0, item.get('fore') or "red")
@@ -826,14 +836,14 @@ class EditorInterface(CtrlInterface):
             self.StyleSetSpec(key, value)
     
     def match_paren(self):
-        ## self.SetIndicatorCurrent(2)
-        ## self.IndicatorClearRange(0, self.TextLength)
+        self.SetIndicatorCurrent(3)
+        self.IndicatorClearRange(0, self.TextLength)
         p = self.cpos
         if self.get_char(p-1) in ")}]>":
             q = self.BraceMatch(p-1)
             if q != -1:
                 self.BraceHighlight(q, p-1) # matched the preceding char
-                ## self.IndicatorFillRange(q, p-q)
+                self.IndicatorFillRange(q, p-q)
                 return q
             else:
                 self.BraceBadLight(p-1)
@@ -841,7 +851,7 @@ class EditorInterface(CtrlInterface):
             q = self.BraceMatch(p)
             if q != -1:
                 self.BraceHighlight(p, q) # matched the following char
-                ## self.IndicatorFillRange(p, q-p+1)
+                self.IndicatorFillRange(p, q-p+1)
                 return q
             else:
                 self.BraceBadLight(p)
@@ -1044,7 +1054,6 @@ class EditorInterface(CtrlInterface):
         self.Bind(stc.EVT_STC_AUTOCOMP_SELECTION, self.on_itext_selection)
         
         self.StyleSetSize(stc.STC_STYLE_DEFAULT, pts)
-
     
     def on_itext_exit(self, evt):
         """Called when exiting filter_text mode."""
@@ -1179,6 +1188,7 @@ class EditorInterface(CtrlInterface):
     
     @contextmanager
     def save_excursion(self):
+        """Save buffer excursion."""
         try:
             p = self.cpos
             q = self.anchor
@@ -1193,6 +1203,7 @@ class EditorInterface(CtrlInterface):
     
     @contextmanager
     def pre_selection(self):
+        """Save buffer cpos and anchor."""
         try:
             p = self.cpos
             q = self.anchor
@@ -1205,13 +1216,26 @@ class EditorInterface(CtrlInterface):
     
     @contextmanager
     def off_readonly(self):
+        """Set buffer to be writable (ReadOnly=False) temporarily."""
+        r = self.ReadOnly
         try:
-            r = self.ReadOnly
             self.ReadOnly = 0
-            yield self
+            yield
         finally:
             self.ReadOnly = r
     
+    @contextmanager
+    def save_attributes(self, **kwargs):
+        """Save buffer attributes (e.g. ReadOnly=False)."""
+        for k, v in kwargs.items():
+            kwargs[k] = getattr(self, k)
+            setattr(self, k, v)
+        try:
+            yield
+        finally:
+            for k, v in kwargs.items():
+                setattr(self, k, v)
+    
     ## --------------------------------
     ## Edit: comment / insert / kill
     ## --------------------------------
@@ -1501,7 +1525,7 @@ class Buffer(EditWindow, EditorInterface):
         })
         
         self.show_folder()
-        self.set_style(self.STYLE)
+        self.set_stylus(self.STYLE)
     
     def __contains__(self, code):
         if inspect.iscode(code) and self.code:
@@ -1792,7 +1816,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
             buf : a buffer to apply (if None, applies to all buffers).
             **kwargs : default style.
             
-                Style           = Buffer.STYLE => set_style
+                Style           = Buffer.STYLE
                 ReadOnly        = False
                 UseTabs         = False
                 ViewEOL         = False
@@ -1806,7 +1830,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         def _setattribute(buf, attr):
             for k, v in attr.items():
                 if k == 'Style':
-                    buf.set_style(v)
+                    buf.set_stylus(v)
                 setattr(buf, k, v)
         if buf:
             _setattribute(buf, kwargs)
@@ -2616,7 +2640,7 @@ class Nautilus(Shell, EditorInterface):
         
         self.wrap(0)
         self.show_folder()
-        self.set_style(self.STYLE)
+        self.set_stylus(self.STYLE)
         
         ## delete unnecessary arrows at startup
         del self.white_arrow
@@ -3230,12 +3254,6 @@ class Nautilus(Shell, EditorInterface):
                           ]
         Shell.CallTipShow(self, pos, '\n'.join(lines))
     
-    def gen_autocomp(self, offset, words, sep=' '):
-        """Call AutoCompShow for the specified words and sep."""
-        if words:
-            self.AutoCompSetSeparator(ord(sep))
-            self.AutoCompShow(offset, sep.join(words))
-    
     def eval_line(self, evt):
         """Evaluate the selected word or line.
         """
@@ -3358,6 +3376,25 @@ class Nautilus(Shell, EditorInterface):
         except IndexError:
             self.message("No completion words")
     
+    def _gen_autocomp(self, j, hint, words, sep=' '):
+        """Call AutoCompShow for the specified words and sep."""
+        ## Prepare on_completion_forward/backward
+        self.__comp_ind = j
+        self.__comp_hint = hint
+        self.__comp_words = words
+        if words:
+            self.AutoCompSetSeparator(ord(sep))
+            self.AutoCompShow(len(hint), sep.join(words))
+    
+    @staticmethod
+    def _get_last_hint(cmdl):
+        return re.search(r"[\w.]*$", cmdl).group(0) # or ''
+    
+    @staticmethod
+    def _get_words_hint(cmdl):
+        text = next(split_words(cmdl, reverse=1), '')
+        return text.rpartition('.') # -> text, sep, hint
+    
     def call_history_comp(self, evt):
         """Called when history-comp mode."""
         if not self.CanEdit():
@@ -3394,16 +3431,12 @@ class Nautilus(Shell, EditorInterface):
             return
         try:
             cmdl = self.cmdlc
-            hint = self.get_last_hint(cmdl)
+            hint = self._get_last_hint(cmdl)
             
             ls = [x for x in self.fragmwords if x.startswith(hint)] # case-sensitive match
             words = sorted(ls, key=lambda s:s.upper())
             
-            self.__comp_ind = 0 if words else -1
-            self.__comp_hint = hint
-            self.__comp_words = words
-            
-            self.gen_autocomp(len(hint), words)
+            self._gen_autocomp(-1, hint, words)
             self.message("[text] {} candidates matched"
                          " with {!r}".format(len(words), hint))
         except Exception:
@@ -3416,26 +3449,24 @@ class Nautilus(Shell, EditorInterface):
             return
         
         def _continue(hints):
-            if hints.endswith(' ') and not force: # 'x, y |'
-                return
-            h = hints.strip()
-            if (not h or h.endswith(',')) and not force: # 'x, y,|'
-                return
-            lh = h.split(',')[-1]   # 'x, y, z|' last hint after ','
-            if len(lh.split()) > 1: # 'x, y as|' contains a space before 'as'
-                return
-            return lh
-        
+            if not hints.endswith(' '):
+                h = hints.strip()
+                if not h.endswith(','):
+                    lh = h.split(',')[-1].strip() # 'x, y, z|' last hint after ','
+                    if ' ' not in lh:             # 'x, y as|' contains no spaces.
+                        return lh
         try:
             cmdl = self.cmdlc
-            hint = self.get_last_hint(cmdl)
+            hint = self._get_last_hint(cmdl)
             
-            m = re.match(r"from\s+([\w.]+)\s+import\s+(.*)", cmdl)
-            if m:
+            if (m := re.match(r"from\s+([\w.]+)\s+import\s+(.*)", cmdl)):
                 text, hints = m.groups()
-                if not _continue(hints):
+                if not _continue(hints) and not force:
                     self.message("[module]>>> waiting for key input...")
                     return
+                elif hints.endswith('.'):
+                    self.message("[module] invalid import syntax.")
+                    return
                 if text not in sys.modules:
                     self.message("[module]>>> loading {}...".format(text))
                 try:
@@ -3444,25 +3475,20 @@ class Nautilus(Shell, EditorInterface):
                     self.message("\b failed: {}".format(e))
                     return
                 ## Add unimported module names.
-                keys = [x[len(text)+1:] for x in self.modules if x.startswith(f"{text}.{hint}")]
+                p = "{}.{}".format(text, hint)
+                keys = [x[len(text)+1:] for x in self.modules if x.startswith(p)]
                 modules.update(k for k in keys if '.' not in k)
+            
+            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
             else:
-                m = re.match(r"(import|from)\s+(.*)", cmdl)
-                if m:
-                    text, hints = m.groups()
-                    if not _continue(hints):
-                        self.message("[module]>>> waiting for key input...")
-                        return
-                    modules = self.modules
-                else:
-                    text, sep, hint = self.get_words_hint(cmdl)
-                    if not text:
-                        return
-                    obj = self.eval(text)
-                    if not hasattr(obj, '__dict__'):
-                        self.message("[module] primitive object: {}".format(obj))
-                        return
-                    modules = set(k for k, v in vars(obj).items() if inspect.ismodule(v))
+                text, sep, hint = self._get_words_hint(cmdl)
+                obj = self.eval(text)
+                modules = set(k for k, v in vars(obj).items() if inspect.ismodule(v))
             
             P = re.compile(hint)
             p = re.compile(hint, re.I)
@@ -3471,11 +3497,7 @@ class Nautilus(Shell, EditorInterface):
             j = next((k for k, w in enumerate(words) if P.match(w)),
                 next((k for k, w in enumerate(words) if p.match(w)), -1))
             
-            self.__comp_ind = j
-            self.__comp_hint = hint
-            self.__comp_words = words
-            
-            self.gen_autocomp(len(hint), words)
+            self._gen_autocomp(j, hint, words)
             self.message("[module] {} candidates matched"
                          " with {!r} in {}".format(len(words), hint, text))
         except re.error as e:
@@ -3483,8 +3505,8 @@ class Nautilus(Shell, EditorInterface):
         except SyntaxError as e:
             self.handler('quit', evt)
             self.message("- {} : {!r}".format(e, text))
-        except Exception:
-            raise
+        except Exception as e:
+            self.message("- {} : {!r}".format(e, text))
     
     def call_word_autocomp(self, evt):
         """Called when word-comp mode."""
@@ -3492,7 +3514,7 @@ class Nautilus(Shell, EditorInterface):
             self.handler('quit', evt)
             return
         try:
-            text, sep, hint = self.get_words_hint(self.cmdlc)
+            text, sep, hint = self._get_words_hint(self.cmdlc)
             obj = self.eval(text)
             
             P = re.compile(hint)
@@ -3502,11 +3524,7 @@ class Nautilus(Shell, EditorInterface):
             j = next((k for k, w in enumerate(words) if P.match(w)),
                 next((k for k, w in enumerate(words) if p.match(w)), -1))
             
-            self.__comp_ind = j
-            self.__comp_hint = hint
-            self.__comp_words = words
-            
-            self.gen_autocomp(len(hint), words)
+            self._gen_autocomp(j, hint, words)
             self.message("[word] {} candidates matched"
                          " with {!r} in {}".format(len(words), hint, text))
         except re.error as e:
@@ -3523,7 +3541,7 @@ class Nautilus(Shell, EditorInterface):
             self.handler('quit', evt)
             return
         try:
-            text, sep, hint = self.get_words_hint(self.cmdlc)
+            text, sep, hint = self._get_words_hint(self.cmdlc)
             obj = self.eval(text)
             
             P = re.compile(hint)
@@ -3533,11 +3551,7 @@ class Nautilus(Shell, EditorInterface):
             j = next((k for k, w in enumerate(words) if P.match(w)),
                 next((k for k, w in enumerate(words) if p.match(w)), -1))
             
-            self.__comp_ind = j
-            self.__comp_hint = hint
-            self.__comp_words = words
-            
-            self.gen_autocomp(len(hint), words)
+            self._gen_autocomp(j, hint, words)
             self.message("[apropos] {} candidates matched"
                          " with {!r} in {}".format(len(words), hint, text))
         except re.error as e:
@@ -3547,12 +3561,3 @@ class Nautilus(Shell, EditorInterface):
             self.message("- {} : {!r}".format(e, text))
         except Exception as e:
             self.message("- {} : {!r}".format(e, text))
-    
-    @staticmethod
-    def get_last_hint(cmdl):
-        return re.search(r"[\w.]*$", cmdl).group(0) # or ''
-    
-    @staticmethod
-    def get_words_hint(cmdl):
-        text = next(split_words(cmdl, reverse=1), '')
-        return text.rpartition('.') # -> text, sep, hint

mwx/wxpdb.py

@@ -246,7 +246,7 @@ class Debugger(Pdb):
             self.set_quit()
             return
     
-    def run(self, cmd):
+    def run(self, cmd, filename="<string>"):
         """Debug a statement executed via the exec() function.
         """
         if self.busy:
@@ -257,10 +257,11 @@ class Debugger(Pdb):
         globals = self.interactive_shell.globals
         locals = self.interactive_shell.locals
         if isinstance(cmd, str):
-            cmd = compile(cmd, "<string>", "exec")
+            cmd = compile(cmd, filename, "exec")
         try:
             frame = inspect.currentframe().f_back
             self.set_trace(frame)
+            self.send_input('s')
             exec(cmd, globals, locals)
         except BdbQuit:
             pass

{mwxlib-0.92.0.dist-info → mwxlib-0.92.4.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.92.0
+Version: 0.92.4
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
-Author: Kazuya O'moto <komoto@jeol.co.jp>
+Author: Kazuya O'moto
 Author-email: komoto@jeol.co.jp
 License: MIT
 Classifier: License :: OSI Approved :: MIT License

{mwxlib-0.92.0.dist-info → mwxlib-0.92.4.dist-info}/RECORD

@@ -1,23 +1,23 @@
 mwx/__init__.py,sha256=5B4YSOuijG1Uo5-FLtLHGB52Cp_F4vnN--4wGPBx7do,2398
-mwx/bookshelf.py,sha256=l0I3xO8BJVd_KOGFhGJsGc6Rf-k_OIWQEdfa-iTRnrI,6619
+mwx/bookshelf.py,sha256=FrissUYdGXLABOzJmMaQU6GXvu6n_9DVW3d5wGwQzjM,6613
 mwx/controls.py,sha256=toNAFJrPFDO7gb0aBU_IlW4AEIEvQJcwBxR-6e04IAc,46700
-mwx/framework.py,sha256=lOBTRsuVMgBHi8831rITsYa2IBiMRFxWDzzfmehfSuM,74619
-mwx/graphman.py,sha256=o5NRKFYZdoDV1qN5FlLARBXK2QTk0KnK-3wuY1nvoV8,69768
+mwx/framework.py,sha256=8r98-kYiW2JTk2gfDLLXbB7Qq9hkecRsNEDtauyj9qc,74895
+mwx/graphman.py,sha256=PBocTQpWa-f8P5-UV2Ugd01qKCGwFe-rZiginNKu_sI,69738
 mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
 mwx/matplot2.py,sha256=TM8V5Ggc5iL9lYyM6V4clqH_vIsgS0GsND2ay9zuT0c,32825
-mwx/matplot2g.py,sha256=Il_vJV7XmZcCD3GOGfKztehFY3XB35n899iuumB7qXc,65575
+mwx/matplot2g.py,sha256=owNKt2EcSkf15hYqx9lnpF9qT-WqdSkXSRsH82sYMTs,65571
 mwx/matplot2lg.py,sha256=IHURrul9JzcLO8Lyll1bW1G215pxgvutDmbQgayG70A,26341
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=FOpnjzs9eODIx419q5YM8UV7B6O19PoF6NjHdUYHCAQ,135812
+mwx/nutshell.py,sha256=deb8JHotpLwTIP8715ux5mzOx-cnefteweUAZh0s-fU,136115
 mwx/utilus.py,sha256=fqxJysHXdLt9OOSKDZnBOwmbHvHJPy1qH3R6dI3NLSw,36947
 mwx/wxmon.py,sha256=Qk86VbuuW2rR46pqEYLur13G_aloWz5SVv6sib30YY0,12717
-mwx/wxpdb.py,sha256=hh3a9rHL5CjQh_2lMMonmZLJKv3RHNgtP4U_VLGbQnM,19411
+mwx/wxpdb.py,sha256=rx_h4EiLEnHbVu2S6VfhWow7NwLAiTAXKiItY4N2qsk,19464
 mwx/wxwil.py,sha256=KdNaHV-5-fYSFN4h3VxXxdgpB6s5PCpuxkSbytg85eE,5586
 mwx/wxwit.py,sha256=2gFHi-8nwWRh26RdvZ_AUP--8PDjJB8TUU72y2fBUWM,7557
 mwx/py/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwxlib-0.92.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.92.0.dist-info/METADATA,sha256=tvDpQGj_EfIvXRPvTjR8faEVsPHukhWIAL5N7u4lOrM,1945
-mwxlib-0.92.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mwxlib-0.92.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.92.0.dist-info/RECORD,,
+mwxlib-0.92.4.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.92.4.dist-info/METADATA,sha256=vt9uGOpka_Xhh-1QCZ3JPEMBPcV7B1QvBnKXdPv3_Sk,1925
+mwxlib-0.92.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+mwxlib-0.92.4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.92.4.dist-info/RECORD,,

{mwxlib-0.92.0.dist-info → mwxlib-0.92.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any