mwxlib 1.2.9__py3-none-any.whl → 1.3.3__py3-none-any.whl

mwx/bookshelf.py

@@ -13,9 +13,11 @@ class MyDropTarget(wx.DropTarget):
         
         self.tree = tree
         self.datado = wx.CustomDataObject("TreeItem")
+        self.textdo = wx.TextDataObject()
         self.filedo = wx.FileDataObject()
         self.do = wx.DataObjectComposite()
         self.do.Add(self.datado)
+        self.do.Add(self.textdo)
         self.do.Add(self.filedo)
         self.SetDataObject(self.do)
     
@@ -31,20 +33,22 @@ class MyDropTarget(wx.DropTarget):
     def OnData(self, x, y, result):
         item = self.tree.Selection
         name = self.tree.GetItemText(item)
-        editor = self.tree.Parent.FindWindow(name) # window.Name (not page.caption)
-        def _load(f):
-            if editor.load_file(f):
-                editor.buffer.SetFocus()
-                editor.message(f"Loaded {f!r} successfully.")
+        editor = self.tree.Parent.FindWindow(name) # window.Name
         self.GetData()
-        data = self.datado.Data
-        if data:
-            f = data.tobytes().decode()
-            _load(f)
+        if self.datado.Data:
+            fn = self.datado.Data.tobytes().decode()
+            editor.load_file(fn)
             self.datado.SetData(b"")
+        elif self.textdo.Text:
+            fn = self.textdo.Text.strip()
+            res = editor.parent.handler("text_dropped", fn)
+            if res is None or not any(res):
+                editor.load_file(fn)
+            result = wx.DragCopy
+            self.textdo.SetText("")
         else:
-            for f in self.filedo.Filenames:
-                _load(f)
+            for fn in self.filedo.Filenames:
+                editor.load_file(fn)
             self.filedo.SetData(wx.DF_FILENAME, None)
         return result
 
@@ -99,14 +103,14 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         }
         def _attach():
             if self and self.parent:
-                for editor in self.parent.all_editors:
+                for editor in self.parent.get_all_editors():
                     editor.handler.append(self.context)
                 self.build_tree()
         wx.CallAfter(_attach)
     
     def OnDestroy(self, evt):
         if self and self.parent:
-            for editor in self.parent.all_editors:
+            for editor in self.parent.get_all_editors():
                 editor.handler.remove(self.context)
         evt.Skip()
     
@@ -129,8 +133,8 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         if clear:
             self.DeleteAllItems()
             self.AddRoot(self.Name)
-        for editor in self.parent.all_editors:
-            self._set_item(self.RootItem, editor.Name, editor.all_buffers)
+        for editor in self.parent.get_all_editors():
+            self._set_item(self.RootItem, editor.Name, editor.get_all_buffers())
         self.Refresh()
     
     def _gen_items(self, root, key=None):

mwx/controls.py

@@ -591,6 +591,7 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
                         for cc in obj.Children: # child of child <wx._core.SizerItem>
                             cc.Show(not cc.IsShown())
                         self.Layout()
+                        self.SendSizeEvent()
                         break
         evt.Skip()
     

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.2.9"
+__version__ = "1.3.3"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -872,18 +872,18 @@ class AuiNotebook(aui.AuiNotebook):
         self.Bind(aui.EVT_AUINOTEBOOK_TAB_RIGHT_DOWN, tab_menu)
     
     @property
-    def all_pages(self):
-        """Returns all window pages."""
+    def all_pages(self): # (deprecated) internal use only
+        """Returns all window pages (internal use only)."""
         return [self.GetPage(i) for i in range(self.PageCount)]
     
     @property
-    def all_tabs(self):
-        """Returns all AuiTabCtrl objects."""
+    def all_tabs(self): # (deprecated) internal use only
+        """Returns all AuiTabCtrl objects (internal use only)."""
         return [x for x in self.Children if isinstance(x, aui.AuiTabCtrl)]
     
     @property
-    def all_panes(self):
-        """Returns all AuiPaneInfo excluding `dummy` one."""
+    def all_panes(self): # (deprecated) internal use only
+        """Returns all AuiPaneInfo excluding `dummy` one (internal use only)."""
         return list(self._mgr.AllPanes)[1:]
     
     def get_pages(self, type=None):
@@ -1033,30 +1033,24 @@ class FileDropLoader(wx.DropTarget):
         index, flags = self.target.HitTest((x, y))
         if index != -1:
             self.target.Selection = index
+            result = wx.DragCopy
+        else:
+            result = wx.DragNone
         return result
     
     def OnData(self, x, y, result):
         editor = self.target.Parent.current_editor
         self.GetData()
-        if self.textdo.TextLength > 1:
-            f = self.textdo.Text.strip()
-            res = editor.load_file(f)
-            if res:
-                editor.buffer.SetFocus()
-                editor.message(f"Loaded {f!r} successfully.")
-                result = wx.DragCopy
-            elif res is None:
-                editor.message(f"Loading {f!r} canceled.")
-                result = wx.DragCancel
-            else:
-                editor.message(f"Loading {f!r} failed.")
-                result = wx.DragNone
-            self.textdo.SetText('')
+        if self.textdo.Text:
+            fn = self.textdo.Text.strip()
+            res = editor.parent.handler("text_dropped", fn)
+            if res is None or not any(res):
+                editor.load_file(fn)
+            result = wx.DragCopy
+            self.textdo.SetText("")
         else:
-            for f in self.filedo.Filenames:
-                if editor.load_file(f):
-                    editor.buffer.SetFocus()
-                    editor.message(f"Loaded {f!r} successfully.")
+            for fn in self.filedo.Filenames:
+                editor.load_file(fn)
             self.filedo.SetData(wx.DF_FILENAME, None)
         return result
 
@@ -1337,8 +1331,8 @@ class ShellFrame(MiniFrame):
             o.write("self.SetSize({})\n".format(self.Size))
             o.write("self.SetPosition({})\n".format(self.Position))
             
-            for book in self.all_editors:
-                for buf in book.all_buffers:
+            for book in self.get_all_editors():
+                for buf in book.get_all_buffers():
                     if buf.mtdelta is not None:
                         o.write("self.{}.load_file({!r}, {})\n"
                                 .format(book.Name, buf.filename, buf.markline+1))
@@ -1446,8 +1440,8 @@ class ShellFrame(MiniFrame):
                           "The trace pointer will be cleared.")
             self.debugger.unwatch() # cf. [pointer_unset] stop_trace
         
-        for book in self.all_editors:
-            for buf in book.all_buffers:
+        for book in self.get_all_editors():
+            for buf in book.get_all_buffers():
                 if buf.need_buffer_save:
                     self.popup_window(book)
                     buf.SetFocus()
@@ -1473,8 +1467,8 @@ class ShellFrame(MiniFrame):
         elif evt.GetActivationReason() == evt.Reason_Mouse\
           and self.__autoload:
             ## Check all buffers that need to be loaded.
-            for book in self.all_editors:
-                for buf in book.all_buffers:
+            for book in self.get_all_editors():
+                for buf in book.get_all_buffers():
                     if buf.need_buffer_load:
                         if wx.MessageBox( # Confirm load.
                                 "The file has been modified externally.\n\n"
@@ -1535,7 +1529,7 @@ class ShellFrame(MiniFrame):
     
     def OnConsolePageClose(self, evt): #<wx._aui.AuiNotebookEvent>
         nb = evt.EventObject
-        win = nb.all_pages[evt.Selection]
+        win = list(nb.get_pages())[evt.Selection]
         if win is self.rootshell:
             ## self.message("Don't close the root shell.")
             nb.WindowStyle &= ~aui.AUI_NB_CLOSE_ON_ACTIVE_TAB
@@ -1550,22 +1544,20 @@ class ShellFrame(MiniFrame):
     def About(self, evt=None):
         self.add_help(
             '\n\n'.join((
-                "#<module 'mwx' from {!r}>".format(__file__),
-                "Author: {!r}".format(__author__),
-                "Version: {!s}".format(__version__),
+                f"#<module 'mwx' from {__file__!r}>",
+                f"Author: {__author__!r}",
+                f"Version: {__version__!s}",
                 self.__class__.__doc__,
                 self.rootshell.__class__.__doc__,
-                
-                ## Thanks to wx.py.shell.
-                "#{!r}".format(wx.py),
-                "Author: {!r}".format(wx.py.version.__author__),
-                "Version: {!s}".format(wx.py.version.VERSION),
+                ## --- Thanks to <wx.py.shell> ---
+                f"#{wx.py!r}",
+                f"Author: {wx.py.version.__author__!r}",
+                f"Version: {wx.py.version.VERSION!s}",
                 wx.py.shell.Shell.__doc__,
                 textwrap.indent("*original" + wx.py.shell.HELP_TEXT, ' '*4),
-                
-                ## Thanks are also due to wx.
-                "#{!r}".format(wx),
-                "To show the credit, press C-M-Mbutton.\n",
+                ## --- Thanks are also due to <wx> ---
+                ## f"#{wx!r}".format(wx),
+                ## f"To show the credit, press [C-M-Mbutton].", # cf. wx.InfoMessageBox(None)
                 ))
             )
     
@@ -1846,7 +1838,7 @@ class ShellFrame(MiniFrame):
     
     def add_log(self, text, noerr=None):
         """Add text to the logging buffer.
-        If noerr <bool> is specified, add a line-marker.
+        If noerr:bool is specified, add a line-marker.
         """
         buf = self.Log.default_buffer or self.Log.new_buffer()
         with buf.off_readonly():
@@ -1861,11 +1853,18 @@ class ShellFrame(MiniFrame):
         ## 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."""
+    def add_help(self, text, title=None):
+        """Add text to the help buffer.
+        If title:str is specified, create a new buffer with that title.
+        """
         buf = self.Help.default_buffer or self.Help.new_buffer()
+        if title is not None:
+            self.Help.find_file(f"*{title}*")
+            buf = self.Help.buffer
         with buf.off_readonly():
-            buf.SetText(text)
+            buf.Text = text
+            buf.EmptyUndoBuffer()
+            buf.SetSavePoint()
         ## Overwrite text and popup the window.
         self.popup_window(self.Help)
         self.Help.swap_page(buf)
@@ -1874,12 +1873,14 @@ class ShellFrame(MiniFrame):
         if not hasattr(target, '__dict__'):
             raise TypeError("primitive objects cannot be targeted")
         
-        shell = self.rootshell.__class__(self, target, name="clone",
-                    style=wx.CLIP_CHILDREN|wx.BORDER_NONE)
-        self.handler('shell_new', shell)
-        self.Show()
-        self.console.AddPage(shell, typename(shell.target))
+        shell = self.find_shell(target)
+        if not shell:
+            shell = self.rootshell.__class__(self, target, name="clone",
+                        style=wx.CLIP_CHILDREN|wx.BORDER_NONE)
+            self.console.AddPage(shell, typename(shell.target))
+            self.handler('shell_new', shell)
         self.popup_window(shell)
+        self.Show()
         shell.SetFocus()
         return shell
     
@@ -1905,8 +1906,16 @@ class ShellFrame(MiniFrame):
         yield from self.console.get_pages(type)
         yield from self.ghost.get_pages(type)
     
+    def get_all_shells(self):
+        """Yields all shells in the notebooks."""
+        yield from self.console.get_pages(type(self.rootshell))
+    
+    def get_all_editors(self):
+        """Yields all editors in the notebooks."""
+        yield from self.ghost.get_pages(type(self.Log))
+    
     @property
-    def all_shells(self):
+    def all_shells(self): # (deprecated) for backward compatibility
         """Yields all books in the notebooks."""
         return self.console.get_pages(type(self.rootshell))
     
@@ -1915,8 +1924,17 @@ class ShellFrame(MiniFrame):
         """Currently selected shell or rootshell."""
         return self.console.CurrentPage
     
+    def find_shell(self, target):
+        """Find a shell targeting the specified object.
+        If found, switch to the corresponding page.
+        """
+        for shell in self.get_all_shells():
+            if shell.target is target:
+                self.console.swap_page(shell)
+                return shell
+    
     @property
-    def all_editors(self):
+    def all_editors(self): # (deprecated) for backward compatibility
         """Yields all editors in the notebooks."""
         return self.ghost.get_pages(type(self.Log))
     
@@ -1926,22 +1944,17 @@ class ShellFrame(MiniFrame):
         editor = self.ghost.CurrentPage
         if isinstance(editor, type(self.Log)):
             return editor
-        return next((x for x in self.all_editors if x.IsShown()), self.Scratch)
+        return next((x for x in self.get_all_editors() if x.IsShown()), self.Scratch)
     
     def find_editor(self, fn):
-        """Find an editor with the specified fn:filename or code.
-        If found, switch to the buffer page.
+        """Find an editor containing the specified fn:filename or code.
+        If found, switch to the corresponding page.
         """
-        return next(self.find_editors(fn), None)
-    
-    def find_editors(self, fn):
-        """Yields all editors with the specified fn:filename or code."""
-        def _f(book):
+        for book in self.get_all_editors():
             buf = book.find_buffer(fn)
             if buf:
                 book.swap_page(buf)
-            return buf
-        return filter(_f, self.all_editors)
+                return book
     
     ## --------------------------------
     ## Find text dialog

mwx/graphman.py

@@ -887,7 +887,7 @@ class Frame(mwx.Frame):
                     return
                 self.Quit()
                 break
-        for frame in self.graph.all_frames:
+        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"
@@ -970,7 +970,7 @@ class Frame(mwx.Frame):
                 win.handler('page_shown', win)
         elif not show and shown:
             if isinstance(win, aui.AuiNotebook):
-                for plug in win.all_pages:
+                for plug in win.get_pages():
                     plug.handler('page_closed', plug)
             else:
                 win.handler('page_closed', win)
@@ -1016,7 +1016,7 @@ class Frame(mwx.Frame):
         pane = evt.GetPane()
         win = pane.window
         if isinstance(win, aui.AuiNotebook):
-            for plug in win.all_pages:
+            for plug in win.get_pages():
                 plug.handler('page_closed', plug)
         else:
             win.handler('page_closed', win)
@@ -1103,6 +1103,7 @@ class Frame(mwx.Frame):
             else:
                 module = import_module(name)
         except Exception as e:
+            traceback.print_exc()
             print(f"- Unable to load {root!r}.", e)
             return False
         
@@ -1328,7 +1329,7 @@ class Frame(mwx.Frame):
         self.load_plug(plug.__module__, force=1, session=session)
         
         ## Update shell.target --> new plug
-        for shell in self.shellframe.all_shells:
+        for shell in self.shellframe.get_all_shells():
             if shell.target is plug:
                 shell.handler('shell_activated', shell)
     
@@ -1425,7 +1426,7 @@ class Frame(mwx.Frame):
         """
         view = self.selected_view
         if not frames:
-            frames = view.all_frames
+            frames = view.get_all_frames()
             if not frames:
                 return None
         
@@ -1492,7 +1493,7 @@ class Frame(mwx.Frame):
                 else:
                     fn = attr.get('pathname') # if not found, try pathname
                     if fn.startswith(r'\\'):
-                        warn(f"The pathnme of {fn!r} contains network path, "
+                        warn(f"The pathname of {fn!r} contains network path, "
                              f"so the search may take long time.", stacklevel=3)
                     if not os.path.exists(fn):
                         mis[name] = res.pop(name) # pop missing items
@@ -1691,7 +1692,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.all_frames
+            frames = self.selected_view.get_all_frames()
             if not frames:
                 return None
         
@@ -1810,7 +1811,7 @@ class Frame(mwx.Frame):
             
             def _save(view):
                 name = view.Name
-                paths = [x.pathname for x in view.all_frames if x.pathname]
+                paths = [x.pathname for x in view.get_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

@@ -772,6 +772,10 @@ class GraphPlot(MatplotPanel):
             return next((art for art in self.__Arts if art.name == j), None)
         return self.__Arts[j]
     
+    def get_all_frames(self):
+        """List of arts <matplotlib.image.AxesImage>."""
+        return self.__Arts
+    
     ## --------------------------------
     ## Property of frame / drawer
     ## --------------------------------
@@ -780,10 +784,10 @@ class GraphPlot(MatplotPanel):
     nbytes_threshold = 24e6
     
     #: image cutoff score percentiles
-    score_percentile = 0.01
+    score_percentile = 0.005
     
     @property
-    def all_frames(self):
+    def all_frames(self): # (deprecated) for backward compatibility
         """List of arts <matplotlib.image.AxesImage>."""
         return self.__Arts
     

mwx/nutshell.py

@@ -27,14 +27,14 @@ from wx.py.shell import Shell
 from wx.py.editwindow import EditWindow
 
 from .utilus import funcall as _F
-from .utilus import ignore
+from .utilus import ignore, typename
 from .utilus import split_words, split_paren, split_tokens, find_modules
 from .framework import CtrlInterface, AuiNotebook, Menu
 
 
 ## URL pattern (flag = re.M | re.A)
 ## url_re = r"https?://[\w/:%#$&?()~.=+-]+"
-url_re = r"https?://[\w/:%#$&?~.=+-]+"  # excluding ()
+url_re = r"https?://[\w/:%#$&?!@~.,;=+-]+"  # excluding ()
 
 ## no-file pattern
 nofile_re = r'[\/:*?"<>|]'
@@ -629,7 +629,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_VLINE, *v)
         self.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_VLINE, *v)
         
-        ## Custom indicators ([BUG] indicator=1 is reset when the buffer is udpated.)
+        ## Custom indicators ([BUG] indicator=1 is reset when the buffer is updated.)
         ## [10-11] filter_text
         ## [2] URL
         ## [3] match_paren
@@ -2022,12 +2022,11 @@ class Buffer(EditorInterface, EditWindow):
     ## File I/O
     ## --------------------------------
     
-    def _load_textfile(self, text, filename):
+    def _load_textfile(self, text):
         with self.off_readonly():
             self.Text = text
             self.EmptyUndoBuffer()
             self.SetSavePoint()
-        self.update_filestamp(filename)
         self.handler('buffer_loaded', self)
     
     def _load_file(self, filename):
@@ -2214,7 +2213,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
     
     def OnPageClose(self, evt): #<wx._aui.AuiNotebookEvent>
         nb = evt.EventObject
-        buf = nb.all_buffers[evt.Selection]
+        buf = list(nb.get_pages())[evt.Selection]
         if buf.need_buffer_save:
             if wx.MessageBox( # Confirm close.
                     "You are closing unsaved content.\n\n"
@@ -2258,7 +2257,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
             _setattribute(buf, kwargs)
         else:
             self.defaultBufferStyle.update(kwargs)
-            for buf in self.all_buffers:
+            for buf in self.get_all_buffers():
                 _setattribute(buf, self.defaultBufferStyle)
     
     def on_activated(self, buf):
@@ -2275,12 +2274,24 @@ class EditorBook(AuiNotebook, CtrlInterface):
     ## --------------------------------
     
     @property
-    def all_buffers(self):
-        """Returns all buffer pages.
-        cf. equiv. AuiNotebook.all_pages
-        """
+    def all_buffers(self): # (deprecated) for backward compatibility
+        """Returns all buffers."""
         return [self.GetPage(j) for j in range(self.PageCount)]
     
+    def get_all_buffers(self, fn=None):
+        """Yields all buffers with specified fn:filename or code."""
+        if fn is None:
+            yield from self.get_pages(Buffer)
+        elif isinstance(fn, str):
+            g = os.path.realpath(fn)
+            for buf in self.get_pages(Buffer):
+                if fn == buf.filename or g == os.path.realpath(buf.filename):
+                    yield buf
+        else:
+            for buf in self.get_pages(Buffer):
+                if fn is buf or fn in buf: # check code
+                    yield buf
+    
     @property
     def menu(self):
         """Yields context menu."""
@@ -2290,7 +2301,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 lambda v: buf.SetFocus(),
                 lambda v: v.Check(buf is self.buffer))
         
-        return (_menu(j+1, x) for j, x in enumerate(self.all_buffers))
+        return (_menu(j+1, x) for j, x in enumerate(self.get_all_buffers()))
     
     @property
     def buffer(self):
@@ -2298,16 +2309,8 @@ class EditorBook(AuiNotebook, CtrlInterface):
         return self.CurrentPage
     
     def find_buffer(self, fn):
-        """Find buffer with specified fn:filename or code."""
-        if isinstance(fn, str):
-            g = os.path.realpath(fn)
-            for buf in self.all_buffers:
-                if fn == buf.filename or g == os.path.realpath(buf.filename):
-                    return buf
-        else:
-            for buf in self.all_buffers:
-                if fn is buf or fn in buf: # check code
-                    return buf
+        """Find a buffer with specified fn:filename or code."""
+        return next(self.get_all_buffers(fn), None)
     
     def swap_buffer(self, buf, lineno=0):
         self.swap_page(buf)
@@ -2385,7 +2388,8 @@ class EditorBook(AuiNotebook, CtrlInterface):
             elif not buf.need_buffer_load:
                 self.swap_buffer(buf, lineno)
                 return True
-            buf._load_textfile(''.join(lines), filename)
+            buf._load_textfile(''.join(lines))
+            buf.update_filestamp(filename)
             self.swap_buffer(buf, lineno)
             return True
         return False
@@ -2415,7 +2419,8 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 kwargs.setdefault('timeout', 3.0)
                 res = requests.get(filename, **kwargs)
                 if res.status_code == requests.codes.OK:
-                    buf._load_textfile(res.text, filename)
+                    buf._load_textfile(res.text)
+                    buf.update_filestamp(filename)
                     self.swap_buffer(buf, lineno)
                     return True
                 res.raise_for_status()  # raise HTTP error; don't catch here.
@@ -2436,13 +2441,14 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     wildcard='|'.join(self.wildcards),
                     style=wx.FD_OPEN|wx.FD_MULTIPLE) as dlg:
                 if dlg.ShowModal() == wx.ID_OK:
-                    for fn in dlg.Paths:
-                        self.find_file(fn)
-            return
-        if self.load_file(filename) == False: # noqa: not None
+                    return all([self.find_file(fn) for fn in dlg.Paths])
+            return None
+        retval = self.load_file(filename)
+        if retval == False: # noqa: not None
             buf = self.create_buffer(filename)
             self.swap_buffer(buf)
             self.post_message("New file.")
+        return retval
     
     def save_file(self, filename, buf=None, verbose=True):
         """Save the current buffer to a file.
@@ -2506,7 +2512,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 return self.save_file(dlg.Path, buf)
     
     def save_all_buffers(self):
-        for buf in self.all_buffers:
+        for buf in self.get_all_buffers():
             if buf.need_buffer_save:
                 self.save_buffer(buf)
     
@@ -2525,7 +2531,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         wx.CallAfter(self.delete_buffer, buf)
     
     def kill_all_buffers(self):
-        for buf in self.all_buffers:
+        for buf in self.get_all_buffers():
             if buf.need_buffer_save:
                 if wx.MessageBox( # Confirm close.
                         "You are closing unsaved content.\n\n"
@@ -2646,7 +2652,7 @@ class Nautilus(EditorInterface, Shell):
     
         C-up        : [0] retrieve previous history
         C-down      : [0] retrieve next history
-        C-j, M-j    : [0] tooltip of eval (for the selected or focused word)
+        C-j         : [0] tooltip of eval (for the selected or focused word)
         C-h, M-h    : [0] calltip of help (for the selected or focused func)
         TAB         : [1] history-comp
         M-p         : [1] retrieve previous history in history-comp mode
@@ -2839,8 +2845,8 @@ class Nautilus(EditorInterface, Shell):
                 'C-S-v pressed' : (0, _F(self.Paste, rectangle=1)),
              'S-insert pressed' : (0, _F(self.Paste)),
            'C-S-insert pressed' : (0, _F(self.Paste, rectangle=1)),
-                  'C-j pressed' : (0, self.eval_line),
-                  'M-j pressed' : (0, self.exec_region),
+                  'C-j pressed' : (0, _F(self.eval_line)),
+                  '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),
@@ -2898,7 +2904,7 @@ class Nautilus(EditorInterface, Shell):
            '*backspace pressed' : (2, self.OnBackspace),
           '*backspace released' : (2, self.call_word_autocomp),
         'C-S-backspace pressed' : (2, ),
-                  'C-j pressed' : (2, self.eval_line),
+                  'C-j pressed' : (2, _F(self.eval_line)),
                  '*alt pressed' : (2, ),
                 '*ctrl pressed' : (2, ),
                '*shift pressed' : (2, ),
@@ -2926,7 +2932,7 @@ class Nautilus(EditorInterface, Shell):
            '*backspace pressed' : (3, self.OnBackspace),
           '*backspace released' : (3, self.call_apropos_autocomp),
         'C-S-backspace pressed' : (3, ),
-                  'C-j pressed' : (3, self.eval_line),
+                  'C-j pressed' : (3, _F(self.eval_line)),
                  '*alt pressed' : (3, ),
                 '*ctrl pressed' : (3, ),
                '*shift pressed' : (3, ),
@@ -2954,7 +2960,7 @@ class Nautilus(EditorInterface, Shell):
            '*backspace pressed' : (4, self.OnBackspace),
           '*backspace released' : (4, self.call_text_autocomp),
         'C-S-backspace pressed' : (4, ),
-                  'C-j pressed' : (4, self.eval_line),
+                  'C-j pressed' : (4, _F(self.eval_line)),
                  '*alt pressed' : (4, ),
                 '*ctrl pressed' : (4, ),
                '*shift pressed' : (4, ),
@@ -3513,13 +3519,13 @@ class Nautilus(EditorInterface, Shell):
         """Short information."""
         doc = inspect.getdoc(obj)\
                 or "No information about {}".format(obj)
-        self.parent.handler('add_help', doc) or print(doc)
+        self.parent.handler('add_help', doc, typename(obj)) or print(doc)
     
     def help(self, obj):
         """Full description."""
         doc = pydoc.plain(pydoc.render_doc(obj))\
                 or "No description about {}".format(obj)
-        self.parent.handler('add_help', doc) or print(doc)
+        self.parent.handler('add_help', doc, typename(obj)) or print(doc)
     
     def eval(self, text):
         return eval(text, self.globals, self.locals)
@@ -3594,7 +3600,7 @@ class Nautilus(EditorInterface, Shell):
         self.cpos, self.anchor = self.anchor, self.cpos
         self.EnsureCaretVisible()
     
-    def eval_line(self, evt):
+    def eval_line(self):
         """Evaluate the selected word or line."""
         if self.CallTipActive():
             self.CallTipCancel()
@@ -3614,7 +3620,7 @@ class Nautilus(EditorInterface, Shell):
         else:
             self.message("No words")
     
-    def exec_region(self, evt):
+    def exec_region(self):
         """Execute the the selected region."""
         if self.CallTipActive():
             self.CallTipCancel()

mwx/testsuite.py

@@ -8,7 +8,7 @@ Usage:
         frm = wx.Frame(None)
         frm.Show()
 
-Is equivlent to:
+Is equivalent to:
     app = wx.App()
     frm = wx.Frame(None)
     frm.Show()

mwx/wxpdb.py

@@ -103,7 +103,7 @@ class Debugger(Pdb):
         pdb.input = _input
         
         def _help():
-            self.parent.handler('add_help', pdb.__doc__)
+            self.parent.handler('add_help', pdb.__doc__, "pdb")
         pdb.help = _help
         
         def dispatch(evt):

{mwxlib-1.2.9.dist-info → mwxlib-1.3.3.dist-info}/METADATA

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

{mwxlib-1.2.9.dist-info → mwxlib-1.3.3.dist-info}/RECORD

@@ -1,18 +1,18 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
-mwx/bookshelf.py,sha256=b_TMDaNIzLHoL0xbbqb3tt0BnRvhLAqaCn_pBdrigZw,7523
-mwx/controls.py,sha256=iSevLKxgB3vdGJr3Wv8nccbFNSw1Voazt_HYjp3RrmM,48044
-mwx/framework.py,sha256=FU5XzSPNg-vWZPvG8lMi7u5htB3aUkdKgpbXlSqIFEU,76141
-mwx/graphman.py,sha256=sKwPy31H4lwtShTAui_6upe_Ys2-MwBHhdFq-3onBNE,70328
+mwx/bookshelf.py,sha256=SFT_08Us0d0tjwlKX9HWaRdbZpcBBK4sCkP2DSetRbE,7747
+mwx/controls.py,sha256=ojMUTl-1YRVVEH32WBIK_NUED6UWAil6EGAYigqh5ak,48090
+mwx/framework.py,sha256=6TtB58J5aYE5R3zNLC7xlhT77FkxKV4cq48jwH8AnrY,76906
+mwx/graphman.py,sha256=jZvSH5SPV_L_cTbYCG2JHN1phuvTpe-UjXmcyJz0QX0,70398
 mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
 mwx/matplot2.py,sha256=Zwte-wwzCg_OHzsBniVgKdaNLzsvJaa1gc0n7VdAqxw,33150
-mwx/matplot2g.py,sha256=ceeAjFkrDz49aSLo_9dIWZZd4HhnSjxe8u9G_ipBHek,64195
+mwx/matplot2g.py,sha256=yloFQCVjR2r4pDBJeKh3uqbdOxoeKO5Z5lhmjVwdRac,64361
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=8mXbHpCmm7lz3XbAxOg7IVC7DaSGBEby1UfTlMl9kjk,5604
-mwx/nutshell.py,sha256=Cy2P4XZ0Wife66oXv3I0dRztlBmlSAlUkVhOq2tWPgs,141187
-mwx/testsuite.py,sha256=kiM3-BVhr42LRRN7xG7pYl3at8o2vnypWSxD8KRvA7c,1228
+mwx/nutshell.py,sha256=8U40niudjo2EjAoSzaZ2g9W-uSlrfcNqfo4A0s2GiaU,141577
+mwx/testsuite.py,sha256=Zk75onPSEn2tf0swS3l-vIn6yTXGB7allIyvJsPHj20,1229
 mwx/utilus.py,sha256=bDeooo2bOcZwvkIdi0ElkT-qoblqzHNFsIveb72NFOo,37528
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
-mwx/wxpdb.py,sha256=ge4hNfeigHGcpnioU1B_BJX_QZjNdtnokUrcZOxcEcI,18814
+mwx/wxpdb.py,sha256=KkTQKwsr7g0uJeN8qdgMz7P2a-I859G1XJyPibAOUDI,18821
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
 mwx/wxwit.py,sha256=1hHtMi2YEy2T_LnUpwdmrIdtCuvxMOFyykqnbq6jLP0,7294
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
@@ -22,8 +22,8 @@ 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.2.9.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-1.2.9.dist-info/METADATA,sha256=zDuA9RxTUziGyT-aTZFZhLSh2fN1_USrpr6lpoTLuT0,7456
-mwxlib-1.2.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-mwxlib-1.2.9.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.2.9.dist-info/RECORD,,
+mwxlib-1.3.3.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-1.3.3.dist-info/METADATA,sha256=wyWGjSDomWzGvIQGyxsVLhdBd1xLwoaX54A0aDFdNUU,7456
+mwxlib-1.3.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+mwxlib-1.3.3.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.3.3.dist-info/RECORD,,