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

mwx/controls.py

@@ -14,7 +14,7 @@ from .utilus import funcall as _F
 from .framework import pack, Menu, CtrlInterface
 
 import numpy as np
-from numpy import nan, inf  # noqa: necessary to eval
+from numpy import nan, inf  # noqa # necessary to eval
 
 
 def _Tip(*tips):
@@ -1035,6 +1035,7 @@ class Button(pb.PlateButton):
     
     def SetBitmap(self, bmp):
         """Set the bitmap displayed in the button.
+        
         (override) If it fails, it clears the bitmap.
         """
         try:

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.4.15"
+__version__ = "1.4.20"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -49,7 +49,7 @@ def deb(target=None, loop=True, locals=None, **kwargs):
     kwargs.setdefault("execStartupScript", True)
     kwargs.setdefault("ensureClose", True)
     
-    if "debrc" in kwargs: # for backward compatibility
+    if "debrc" in kwargs:  # for backward compatibility
         warn("Deprecated keyword: 'debrc'. Use 'session' instead.", DeprecationWarning)
         kwargs.setdefault('session', kwargs.pop('debrc'))
     
@@ -618,8 +618,9 @@ class Menu(wx.Menu):
     def Destroy(self):
         try:
             self._unbind()
-        finally:
-            return wx.Menu.Destroy(self)
+        except Exception:
+            pass
+        return wx.Menu.Destroy(self)
     
     @staticmethod
     def Popup(parent, menulist, *args, **kwargs):
@@ -795,11 +796,9 @@ class Frame(wx.Frame, KeyCtrlInterfaceMixin):
                       "About this software")
     
     def Destroy(self):
-        try:
-            self.timer.Stop()
-            self.shellframe.Destroy() # shellframe is not my child
-        finally:
-            return wx.Frame.Destroy(self)
+        self.timer.Stop()
+        self.shellframe.Destroy() # shellframe is not my child
+        return wx.Frame.Destroy(self)
 
 
 class MiniFrame(wx.MiniFrame, KeyCtrlInterfaceMixin):
@@ -1255,9 +1254,9 @@ class ShellFrame(MiniFrame):
                    '* released' : (0, fork_debugger),
                   'C-g pressed' : (0, self.Quit, fork_debugger),
                    'f1 pressed' : (0, self.About),
-                  'C-f pressed' : (0, self.OnFindText),
-                   'f3 pressed' : (0, self.OnFindNext),
-                 'S-f3 pressed' : (0, self.OnFindPrev),
+                  'C-f pressed' : (0, self.on_search_dialog),
+                   'f3 pressed' : (0, self.repeat_forward_search),
+                 'S-f3 pressed' : (0, self.repeat_backward_search),
                   'f11 pressed' : (0, _F(self.toggle_window, win=self.ghost, alias='toggle_ghost')),
                 'S-f11 pressed' : (0, _F(self.toggle_window, win=self.watcher, alias='toggle_watcher')),
                   'f12 pressed' : (0, _F(self.Close, alias="close")),
@@ -1413,12 +1412,11 @@ class ShellFrame(MiniFrame):
             del builtins.highlight
         except AttributeError:
             pass
-        try:
-            self.timer.Stop()
-            self.save_session()
-        finally:
-            self._mgr.UnInit()
-            return MiniFrame.Destroy(self)
+        
+        self.timer.Stop()
+        self.save_session()
+        self._mgr.UnInit()
+        return MiniFrame.Destroy(self)
     
     def OnClose(self, evt):
         if self.debugger.busy:
@@ -1493,24 +1491,16 @@ class ShellFrame(MiniFrame):
         evt.Skip()
     
     def OnShow(self, evt):
-        pane = self._mgr.GetPane(self.watcher)
-        if evt.IsShown():
-            if pane.IsShown():
-                self.inspector.watch()
-                self.monitor.watch()
-        else:
-            if pane.IsDocked():
-                self.inspector.unwatch()
-                self.monitor.unwatch()
+        for pane in self._mgr.GetAllPanes():
+            ## When the window is hidden, disable docking and keep child panes floating.
+            pane.Dockable(evt.IsShown() or pane.IsDocked())
         evt.Skip()
     
     def OnGhostShow(self, evt):
         if evt.IsShown():
             self.inspector.watch()
-            self.monitor.watch()
         else:
             self.inspector.unwatch()
-            self.monitor.unwatch()
         evt.Skip()
     
     def OnConsolePageChanged(self, evt): #<wx._aui.AuiNotebookEvent>
@@ -1610,6 +1600,7 @@ class ShellFrame(MiniFrame):
     
     def Quit(self, evt=None):
         """Stop debugger and monitor."""
+        self.monitor.unwatch()
         self.debugger.unwatch()
         self.debugger.send_input('\n') # terminates the reader of threading pdb
         shell = self.debugger.interactive_shell # reset interp locals
@@ -1951,13 +1942,13 @@ class ShellFrame(MiniFrame):
         return next((x for x in self.get_all_editors() if x.IsShown()), self.Scratch)
     
     ## --------------------------------
-    ## Find text dialog
+    ## Find / Replace text dialog
     ## --------------------------------
     ## *** The following code is a modification of <wx.py.frame.Frame> ***
     
     __find_target = None
     
-    def OnFindText(self, evt):
+    def on_search_dialog(self, evt):
         if self.findDlg is not None:
             self.findDlg.SetFocus()
             return
@@ -1967,29 +1958,38 @@ class ShellFrame(MiniFrame):
             return
         self.__find_target = wnd
         self.findData.FindString = wnd.topic_at_caret
-        self.findDlg = wx.FindReplaceDialog(wnd, self.findData, "Find",
-                            style=wx.FR_NOWHOLEWORD|wx.FR_NOUPDOWN)
+        self.findData.Flags |= wx.FR_DOWN
+        self.findDlg = wx.FindReplaceDialog(wnd, self.findData, "Find")
         self.findDlg.Show()
     
-    def OnFindNext(self, evt, backward=False): #<wx._core.FindDialogEvent>
-        data = self.findData
-        down_p = data.Flags & wx.FR_DOWN
-        if (backward and down_p) or (not backward and not down_p):
-            data.Flags ^= wx.FR_DOWN # toggle up/down flag
+    def repeat_forward_search(self, evt):
+        self.OnFindNext(evt, direction=True)
+    
+    def repeat_backward_search(self, evt):
+        self.OnFindNext(evt, direction=False)
+    
+    def OnFindNext(self, evt, direction=None): #<wx._core.FindDialogEvent>
+        if not self.findData.FindString:
+            self.message("No last search.")
+            return
+        
+        if direction is not None:
+            ## dir = self.findData.Flags & wx.FR_DOWN  # 0:up, 1:down
+            ## if direction != dir:
+            ##     self.findData.Flags ^= wx.FR_DOWN  # toggle up/down flag
+            if direction:
+                self.findData.Flags |= wx.FR_DOWN
+            else:
+                self.findData.Flags &= ~wx.FR_DOWN
         
         wnd = wx.Window.FindFocus()
         if not isinstance(wnd, stc.StyledTextCtrl):
             wnd = self.__find_target
             if not wnd:
                 return
-        wnd.DoFindNext(data, self.findDlg or wnd)
+        wnd.DoFindNext(self.findData, self.findDlg or wnd)
         if self.findDlg:
             self.OnFindClose(None)
-        wnd.EnsureVisible(wnd.cline)
-        wnd.ensureLineMoreOnScreen(wnd.cline)
-    
-    def OnFindPrev(self, evt):
-        self.OnFindNext(evt, backward=True)
     
     def OnFindClose(self, evt): #<wx._core.FindDialogEvent>
         self.findDlg.Destroy()
@@ -2003,7 +2003,7 @@ def filling(obj=None, **kwargs):
                          rootLabel=typename(obj),
                          pos=wx.GetMousePosition(),
                          **kwargs)
-    frame.filling.text.WrapMode = 0 # no wrap
-    frame.filling.text.Zoom = -1 # zoom level of size of fonts
+    frame.filling.text.WrapMode = 0  # no wrap
+    frame.filling.text.Zoom = -1  # zoom level of size of fonts
     frame.Show()
     return frame

mwx/graphman.py

@@ -30,10 +30,10 @@ from .utilus import funcall as _F
 from .controls import KnobCtrlPanel, Icon
 from .framework import CtrlInterface, AuiNotebook, Menu, FSM
 
-from .matplot2 import MatplotPanel # noqa
+from .matplot2 import MatplotPanel  # noqa
 from .matplot2g import GraphPlot
-from .matplot2lg import LinePlot # noqa
-from .matplot2lg import LineProfile # noqa
+from .matplot2lg import LinePlot  # noqa
+from .matplot2lg import LineProfile  # noqa
 from .matplot2lg import Histogram
 
 
@@ -898,8 +898,6 @@ class Frame(mwx.Frame):
         evt.Skip()
     
     def Destroy(self):
-        ## for name in list(self.plugins):
-        ##     self.unload_plug(name) # => plug.Destroy
         self._mgr.UnInit()
         return mwx.Frame.Destroy(self)
     
@@ -1467,8 +1465,8 @@ class Frame(mwx.Frame):
     @classmethod
     def read_attributes(self, filename):
         """Read attributes file."""
-        from numpy import nan, inf  # noqa: necessary to eval
-        import datetime             # noqa: necessary to eval
+        from numpy import nan, inf  # noqa # necessary to eval
+        import datetime             # noqa # necessary to eval
         try:
             res = {}
             mis = {}
@@ -1492,8 +1490,7 @@ class Frame(mwx.Frame):
         except Exception as e:
             print("- Failed to read attributes.", e)
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
-        finally:
-            return res, mis # finally raises no exception
+        return res, mis
     
     @classmethod
     def write_attributes(self, filename, frames):
@@ -1504,7 +1501,6 @@ class Frame(mwx.Frame):
             
             ## `res` order may differ from that of given frames,
             ## so we take a few steps to merge `new` to be exported.
-            
             res.update(new) # res updates to new info,
             new.update(res) # copy res back keeping new order.
             
@@ -1514,8 +1510,7 @@ class Frame(mwx.Frame):
         except Exception as e:
             print("- Failed to write attributes.", e)
             wx.MessageBox(str(e), style=wx.ICON_ERROR)
-        finally:
-            return new, mis # finally raises no exception
+        return new, mis
     
     def load_frame(self, paths=None, view=None):
         """Load frames from files to the view window.
@@ -1800,13 +1795,12 @@ class Frame(mwx.Frame):
             o.write("self._mgr.LoadPerspective({!r})\n".format(self._mgr.SavePerspective()))
             
             def _save(view):
-                name = view.Name
                 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")
+                o.write(f"self.{view.Name}.unit = {view.unit:g}\n")
+                o.write(f"self.load_frame({paths!r}, self.{view.Name})\n")
                 try:
                     index = paths.index(view.frame.pathname)
-                    o.write(f"self.{name}.select({index})\n")
+                    o.write(f"self.{view.Name}.select({index})\n")
                 except Exception:
                     pass
             

mwx/matplot2.py

@@ -3,12 +3,11 @@
 """
 import wx
 
-import matplotlib; matplotlib.use('wxagg') # noqa
+import matplotlib; matplotlib.use('wxagg')  # noqa
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
 from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as Toolbar
 from matplotlib.widgets import Cursor
 from matplotlib.figure import Figure
-from matplotlib import cm
 import numpy as np
 
 from . import framework as mwx
@@ -40,6 +39,7 @@ if 1:
     class Cursor(Cursor):
         def onmove(self, event):
             """Internal event handler to draw the cursor when the mouse moves.
+            
             (override) If the cursor is off the axes, the xdata and ydata will
                        be None, and will simply be cleared rather than drawn.
             """

mwx/matplot2g.py

@@ -13,7 +13,7 @@ from scipy import ndimage as ndi
 
 from . import framework as mwx
 from .framework import Menu
-from .utilus import warn
+## from .utilus import warn
 from .utilus import funcall as _F
 from .controls import Clipboard
 from .matplot2 import MatplotPanel

mwx/mgplt.py

@@ -154,7 +154,5 @@ class GnuplotFrame(mwx.Frame):
         self.menubar.reset()
     
     def Destroy(self):
-        try:
-            del self.gnuplot
-        finally:
-            return mwx.Frame.Destroy(self)
+        del self.gnuplot
+        return mwx.Frame.Destroy(self)

mwx/nutshell.py

@@ -61,6 +61,7 @@ class Stylus:
         stc.STC_STYLE_BRACELIGHT  : "fore:#000000,back:#ffffb8,bold",
         stc.STC_STYLE_BRACEBAD    : "fore:#000000,back:#ff0000,bold",
         stc.STC_STYLE_CONTROLCHAR : "size:6",
+        stc.STC_STYLE_INDENTGUIDE : "",
         stc.STC_STYLE_CARETLINE   : "fore:#000000,back:#ffff7f,size:2", # optional
         stc.STC_STYLE_ANNOTATION  : "fore:#7f0000,back:#ff7f7f", # optional
         stc.STC_P_DEFAULT         : "fore:#000000",
@@ -69,11 +70,11 @@ class Stylus:
         stc.STC_P_COMMENTLINE     : "fore:#007f7f,back:#ffcfcf",
         stc.STC_P_COMMENTBLOCK    : "fore:#007f7f,back:#ffcfcf,eol",
         stc.STC_P_NUMBER          : "fore:#7f0000",
-        stc.STC_P_STRINGEOL       : "fore:#000000,back:#ffcfcf",
         stc.STC_P_CHARACTER       : "fore:#7f7f7f",
         stc.STC_P_STRING          : "fore:#7f7f7f",
         stc.STC_P_TRIPLE          : "fore:#7f7f7f",
         stc.STC_P_TRIPLEDOUBLE    : "fore:#7f7f7f",
+        stc.STC_P_STRINGEOL       : "fore:#000000,back:#ffcfcf,eol",
         stc.STC_P_CLASSNAME       : "fore:#7f00ff,bold",
         stc.STC_P_DEFNAME         : "fore:#0000ff,bold",
         stc.STC_P_WORD            : "fore:#0000ff",
@@ -87,6 +88,7 @@ class Stylus:
         stc.STC_STYLE_BRACELIGHT  : "fore:#000000,back:#cccccc,bold",
         stc.STC_STYLE_BRACEBAD    : "fore:#000000,back:#ff0000,bold",
         stc.STC_STYLE_CONTROLCHAR : "size:6",
+        stc.STC_STYLE_INDENTGUIDE : "",
         stc.STC_STYLE_CARETLINE   : "fore:#000000,back:#f0f0ff,size:2", # optional
         stc.STC_STYLE_ANNOTATION  : "fore:#7f0000,back:#ff7f7f", # optional
         stc.STC_P_DEFAULT         : "fore:#000000",
@@ -95,11 +97,11 @@ class Stylus:
         stc.STC_P_COMMENTLINE     : "fore:#007f00,back:#f0fff0",
         stc.STC_P_COMMENTBLOCK    : "fore:#007f00,back:#f0fff0,eol",
         stc.STC_P_NUMBER          : "fore:#e02000",
-        stc.STC_P_STRINGEOL       : "fore:#7f7f7f,back:#ffc0c0,eol",
         stc.STC_P_CHARACTER       : "fore:#7f7f7f",
         stc.STC_P_STRING          : "fore:#7f7f7f",
         stc.STC_P_TRIPLE          : "fore:#7f7f7f",
         stc.STC_P_TRIPLEDOUBLE    : "fore:#7f7f7f",
+        stc.STC_P_STRINGEOL       : "fore:#7f7f7f,back:#ffc0c0,eol",
         stc.STC_P_CLASSNAME       : "fore:#7f00ff,bold",
         stc.STC_P_DEFNAME         : "fore:#0000ff,bold",
         stc.STC_P_WORD            : "fore:#0000ff",
@@ -113,6 +115,7 @@ class Stylus:
         stc.STC_STYLE_BRACELIGHT  : "fore:#ffffff,back:#202020,bold",
         stc.STC_STYLE_BRACEBAD    : "fore:#ffffff,back:#ff0000,bold",
         stc.STC_STYLE_CONTROLCHAR : "size:6",
+        stc.STC_STYLE_INDENTGUIDE : "",
         stc.STC_STYLE_CARETLINE   : "fore:#ffffff,back:#123460,size:2", # optional
         stc.STC_STYLE_ANNOTATION  : "fore:#7f0000,back:#ff7f7f", # optional
         stc.STC_P_DEFAULT         : "fore:#cccccc",
@@ -121,11 +124,11 @@ class Stylus:
         stc.STC_P_COMMENTLINE     : "fore:#42c18c,back:#004040",
         stc.STC_P_COMMENTBLOCK    : "fore:#42c18c,back:#004040,eol",
         stc.STC_P_NUMBER          : "fore:#ffc080",
-        stc.STC_P_STRINGEOL       : "fore:#cccccc,back:#004040,eol",
         stc.STC_P_CHARACTER       : "fore:#a0a0a0",
-        stc.STC_P_STRING          : "fore:#a0a0a0",
-        stc.STC_P_TRIPLE          : "fore:#a0a0a0,back:#004040",
-        stc.STC_P_TRIPLEDOUBLE    : "fore:#a0a0a0,back:#004040",
+        stc.STC_P_STRING          : "fore:#a0c0ff",
+        stc.STC_P_TRIPLE          : "fore:#a0a0a0",
+        stc.STC_P_TRIPLEDOUBLE    : "fore:#a0c0ff",
+        stc.STC_P_STRINGEOL       : "fore:#cccccc,back:#400000,eol",
         stc.STC_P_CLASSNAME       : "fore:#61d6d6,bold",
         stc.STC_P_DEFNAME         : "fore:#3a96ff,bold",
         stc.STC_P_WORD            : "fore:#80c0ff",
@@ -201,7 +204,10 @@ class AutoCompInterfaceMixin:
         super().CallTipShow(pos, tip)
     
     def autoCallTipShow(self, command, insertcalltip=True):
-        """Display argument spec and docstring in a popup window."""
+        """Display argument spec and docstring in a popup window.
+        
+        (override) Fix cursor position on calltip insertion.
+        """
         if self.CallTipActive():
             self.CallTipCancel()
         
@@ -596,16 +602,16 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         ## Global style for all languages
         ## font = wx.Font(9, wx.MODERN, wx.NORMAL, wx.NORMAL, False, "MS Gothic")
         ## self.StyleSetFont(stc.STC_STYLE_DEFAULT, font)
-        
         ## self.StyleClearAll()
-        ## self.SetSelForeground(True, wx.SystemSettings.GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT))
-        ## self.SetSelBackground(True, wx.SystemSettings.GetColour(wx.SYS_COLOUR_HIGHLIGHT))
+        ## => STC_STYLE_DEFAULT に設定したスタイルを他のスタイルに全適用する
         
         ## The magin style for line numbers and symbols
         ## [0] for markers, 10 pixels wide, mask 0b11111
         ## [1] for numbers, 32 pixels wide, mask 0x01ffffff (~stc.STC_MASK_FOLDERS)
         ## [2] for borders,  1 pixels wide, mask 0xfe000000 ( stc.STC_MASK_FOLDERS)
-        
+        ## 
+        ## cf. `EditWindow.setDisplayLineNumbers`
+        ## 
         ## 32 bit margin mask
         ## [0] 1111,1111,1111,1111,1111,1111,1111,1111 = -1 for all markers
         ## [1] 0000,0001,1111,1111,1111,1111,1111,1111 = 0x01ffffff for markers
@@ -628,7 +634,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         
         self.SetMarginLeft(2) # +1 margin at the left
         
-        self.SetFoldFlags(0x10) # draw below if not expanded
+        self.SetFoldFlags(stc.STC_FOLDFLAG_LINEAFTER_CONTRACTED)
         
         self.SetProperty('fold', '1') # Enable folder property
         
@@ -742,7 +748,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     
     def add_marker(self, line, n):
         if self.MarkerAdd(line, n):
-            self.EnsureVisible(line) # expand if folded
+            self.EnsureVisible(line)  # expand if folded
             self.handler('{}_set'.format(self.marker_names[n]), line)
     
     def del_marker(self, n):
@@ -754,7 +760,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     def goto_marker(self, markerMask, selection=False):
         line = self.MarkerNext(0, markerMask)
         if line != -1:
-            self.EnsureVisible(line) # expand if folded
+            self.EnsureVisible(line)  # expand if folded
             self.goto_line(line, selection)
             self.recenter()
     
@@ -1199,6 +1205,9 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
             self.StyleSetSpec(stc.STC_STYLE_DEFAULT, default)
             self.StyleClearAll()
         
+        self.SetSelForeground(True, wx.SystemSettings.GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT))
+        self.SetSelBackground(True, wx.SystemSettings.GetColour(wx.SYS_COLOUR_HIGHLIGHT))
+        
         ## Add style to the folding margin
         item = _map(spec.get(stc.STC_STYLE_LINENUMBER, ''))
         if item:
@@ -1216,10 +1225,12 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
                 self.SetFoldMarginColour(True, item.get('fore'))
                 self.SetFoldMarginHiColour(True, item.get('fore'))
         
+        self.SetCaretLineVisible(0)
+        self.SetCaretForeground(_map(default).get('fore'))
+        
         ## Custom style for caret and line colour
         item = _map(spec.pop(stc.STC_STYLE_CARETLINE, ''))
         if item:
-            self.SetCaretLineVisible(0)
             if 'fore' in item:
                 self.SetCaretForeground(item['fore'])
             if 'back' in item:
@@ -1311,6 +1322,48 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         if not hl + offset < vl < hl + n - 1 - offset:
             self.ScrollToLine(vl - n//2)
     
+    def DoFindNext(self, findData, findDlg=None):
+        """Find the search text defined in `findData`.
+        
+        If found, selects the matched text and scrolls to its line.
+        Typically called from `wx.EVT_FIND` event handlers.
+        
+        (override) Enables the whole word search.
+                   Returns True if a match is found, False otherwise.
+        """
+        flags = 0
+        if findData.Flags & wx.FR_MATCHCASE: flags |= wx.stc.STC_FIND_MATCHCASE
+        if findData.Flags & wx.FR_WHOLEWORD: flags |= wx.stc.STC_FIND_WHOLEWORD
+        self.SetSearchFlags(flags)
+        
+        backward = not (findData.Flags & wx.FR_DOWN)
+        findstring = findData.FindString
+        if backward:
+            self.TargetStart = self.anchor  # backward anchor
+            self.TargetEnd = 0
+        else:
+            self.TargetStart = self.cpos  # forward anchor
+            self.TargetEnd = self.TextLength
+        loc = self.SearchInTarget(findstring)
+        
+        ## If it wasn't found then restart at beginning.
+        if loc == -1:
+            self.TargetStart = self.TextLength if backward else 0
+            loc = self.SearchInTarget(findstring)
+        
+        ## Was it still not found?
+        if loc == -1:
+            wx.MessageBox("Unable to find the search text.",
+                          "Not found!", wx.OK|wx.ICON_INFORMATION)
+            if findDlg:
+                wx.CallAfter(findDlg.SetFocus)
+            return False
+        
+        self.SetSelection(loc, loc + len(findstring))
+        self.EnsureVisible(self.cline)  # expand if folded
+        self.EnsureCaretVisible()
+        return True
+    
     ## --------------------------------
     ## Search functions
     ## --------------------------------
@@ -1425,17 +1478,22 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         if not text:
             self.message("No words")
             return
-        lw = len(text.encode()) # for multi-byte string
+        wholeword = (not self.SelectedText)  # Enable or disable whole word search.
+        lw = len(text.encode())
         lines = []
-        for p in self.search_text(text, mode=(not self.SelectedText)):
+        for p in self.search_text(text, wholeword):
             lines.append(self.LineFromPosition(p))
             for i in (10, 11,):
                 self.SetIndicatorCurrent(i)
                 self.IndicatorFillRange(p, lw)
-        self.__itextlines = sorted(set(lines)) # keep order, no duplication
+        self.__itextlines = sorted(set(lines))  # keep order, no duplication
         self.message("{}: {} found".format(text, len(lines)))
         try:
             self.TopLevelParent.findData.FindString = text
+            if wholeword:
+                self.TopLevelParent.findData.Flags |= wx.FR_WHOLEWORD
+            else:
+                self.TopLevelParent.findData.Flags &= ~wx.FR_WHOLEWORD
         except AttributeError:
             pass
     
@@ -1471,7 +1529,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
             evt.Skip()
             return
         line = self.__itextlines[i]
-        self.EnsureVisible(line) # expand if folded
+        self.EnsureVisible(line)  # expand if folded
         self.goto_line(line)
         self.recenter()
         self.on_itext_exit(evt)
@@ -1703,8 +1761,12 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     @editable
     def kill_line(self):
         if not self.SelectedText:
-            if self.cpos == self.eol:
-                self.WordRightEndExtend() # Select cr/lf
+            p = self.cpos
+            if p == self.eol:
+                ## self.WordRightEndExtend()  # Select cr/lf chunks
+                if self.get_char(p) == '\r': p += 1
+                if self.get_char(p) == '\n': p += 1
+                self.cpos = p
             else:
                 self.cpos = self.eol
         self.ReplaceSelection('')
@@ -1712,8 +1774,12 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     @editable
     def backward_kill_line(self):
         if not self.SelectedText:
-            if self.cpos == self.bol:
-                self.WordLeftExtend() # Select cr/lf
+            p = self.cpos
+            if p == self.bol:
+                ## self.WordLeftExtend()  # Select cr/lf chunks
+                if self.get_char(p-1) == '\n': p -= 1
+                if self.get_char(p-1) == '\r': p -= 1
+                self.cpos = p
             else:
                 self.cpos = self.bol
         self.ReplaceSelection('')
@@ -1904,6 +1970,7 @@ class Buffer(EditorInterface, EditWindow):
              '*button* pressed' : (0, skip, dispatch),
                'escape pressed' : (-1, self.on_enter_escmap),
                   'C-h pressed' : (0, self.call_helpTip),
+                    '. pressed' : (2, self.OnEnterDot),
                   'C-. pressed' : (2, self.call_word_autocomp),
                   'C-/ pressed' : (3, self.call_apropos_autocomp),
                   'M-. pressed' : (2, self.call_word_autocomp),
@@ -2028,6 +2095,17 @@ class Buffer(EditorInterface, EditWindow):
         self.update_caption()
         evt.Skip()
     
+    def OnEnterDot(self, evt):
+        if not self.CanEdit():
+            self.handler('quit', evt)
+            return
+        p = self.cpos
+        lst = self.get_style(p-1)
+        rst = self.get_style(p)
+        if lst not in ('moji', 'word', 'rparen') or rst == 'word':
+            self.handler('quit', evt) # don't enter autocomp
+        evt.Skip()
+    
     def on_activated(self, buf):
         """Called when the buffer is activated."""
         self.update_caption()
@@ -2162,7 +2240,7 @@ class Buffer(EditorInterface, EditWindow):
                 lx = lines[-1] - 1
                 self.red_arrow = lx
                 self.goto_line(lx)
-                self.EnsureVisible(lx) # expand if folded
+                self.EnsureVisible(lx)  # expand if folded
                 self.EnsureCaretVisible()
                 self.AnnotationSetStyle(lx, stc.STC_STYLE_ANNOTATION)
                 self.AnnotationSetText(lx, msg)
@@ -2490,7 +2568,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     return all([self.find_file(fn) for fn in dlg.Paths])
             return None
         retval = self.load_file(filename)
-        if retval == False: # noqa: not None
+        if retval == False:  # noqa # to check if not None
             buf = self.create_buffer(filename)
             self.swap_buffer(buf)
             self.post_message("New file.")
@@ -3079,39 +3157,41 @@ class Nautilus(EditorInterface, Shell):
         Backspace-guard from autocomp eating over a prompt whitespace.
         """
         if self.cpos == self.bolc:
-            self.handler('quit', evt) # don't eat backward prompt
+            self.handler('quit', evt) # Don't eat backward prompt
             return
         evt.Skip()
     
     @editable
-    def backward_kill_word(self): # (override)
+    def backward_kill_word(self):  # (override)
         if not self.SelectedText:
+            if self.cpos <= self.bolc:
+                return
             text, lp = self.CurLine
             if text[:lp] == sys.ps2:
-                self.cpos -= lp       # Select ps2:prompt
-                self.WordLeftExtend() # Select cr/lf
+                self.cpos -= lp        # Select ps2:prompt
+                self.WordLeftExtend()  # Select cr/lf chunks
             else:
-                q = max(self.bol, self.bolc) # for debugger mode: bol <= bolc
                 self.WordLeftExtend()
+                q = max(self.bol, self.bolc)  # for debugger mode: bol <= bolc
                 if self.cpos < q:
-                    self.cpos = q # Don't skip back prompt
+                    self.cpos = q  # Don't skip back ps2:prompt
         self.ReplaceSelection('')
     
     @editable
-    def backward_kill_line(self): # (override)
+    def backward_kill_line(self):  # (override)
         if not self.SelectedText:
+            if self.cpos <= self.bolc:
+                return
             text, lp = self.CurLine
             if text[:lp] == sys.ps2:
-                self.cpos -= lp       # Select ps2:prompt
-                self.WordLeftExtend() # Select cr/lf
+                self.cpos -= lp        # Select ps2:prompt
+                self.WordLeftExtend()  # Select cr/lf chunks
             else: 
                 q = max(self.bol, self.bolc) # for debugger mode: bol <= bolc
-                if self.cpos <= self.bolc:
-                    return
-                elif self.cpos > q:
+                if self.cpos > q:
                     self.cpos = q
                 else:
-                    self.WordLeftExtend() # Select cr/lf
+                    self.WordLeftExtend()  # Select cr/lf chunks
         self.ReplaceSelection('')
     
     def OnEnter(self, evt):

mwx/plugins/ffmpeg_view.py

@@ -157,20 +157,18 @@ class Plugin(Layer):
         
         self.mc.Bind(wx.EVT_KEY_DOWN, self.on_hotkey_down)
         self.mc.Bind(wx.EVT_KEY_UP, self.on_hotkey_up)
-        
-        self.Bind(wx.EVT_SHOW, self.OnShow)
     
     def Destroy(self):
-        try:
-            self.parent.handler.unbind("unknown_format", self.load_media)
-        finally:
-            return Layer.Destroy(self)
+        self.parent.handler.unbind("unknown_format", self.load_media)
+        if self.mc:
+            self.mc.Destroy()
+        return Layer.Destroy(self)
     
     def OnShow(self, evt):
         if not evt.IsShown():
             if self.mc:
                 self.mc.Stop()
-        evt.Skip()
+        Layer.OnShow(self, evt)
     
     def OnMediaLoaded(self, evt):
         self.ss.range = (0, self.video_dur, 0.01)

mwx/plugins/frame_listview.py

@@ -113,10 +113,8 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
                   lambda v: Menu.Popup(self, self.menu))
     
     def Destroy(self):
-        try:
-            self.Target.handler.remove(self.context)
-        finally:
-            return wx.ListCtrl.Destroy(self)
+        self.Target.handler.remove(self.context)
+        return wx.ListCtrl.Destroy(self)
     
     def UpdateInfo(self, frame):
         ls = ("{}".format(frame.index),

mwx/utilus.py

@@ -16,8 +16,7 @@ import fnmatch
 import pkgutil
 import pydoc
 import inspect
-from inspect import (isclass, ismodule, ismethod, isbuiltin,
-                     isfunction, isgenerator, isframe, iscode, istraceback)
+from inspect import isclass, ismodule, ismethod, isbuiltin, isfunction, isgenerator  # noqa
 from pprint import pprint
 
 

mwx/wxmon.py

@@ -107,7 +107,8 @@ class EventMonitor(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
             return
         if not isinstance(widget, wx.Object):
             wx.MessageBox("Cannot watch the widget.\n\n"
-                          "- {!r} is not a wx.Object.".format(widget))
+                          "- {!r} is not a wx.Object.".format(widget),
+                          self.__module__)
             return
         self._target = widget
         self.target = widget

mwx/wxpdb.py

@@ -243,7 +243,6 @@ class Debugger(Pdb):
                          f"Debugger is closed.\n\n{e}")
         finally:
             self.set_quit()
-            return
     
     def run(self, cmd, filename="<string>"):
         """Debug a statement executed via the exec() function.
@@ -270,7 +269,6 @@ class Debugger(Pdb):
                          f"Debugger is closed.\n\n{e}")
         finally:
             self.set_quit()
-            return
     
     ## --------------------------------
     ## Actions for handler

mwx/wxwit.py

@@ -8,7 +8,7 @@ import wx.lib.inspection as it
 
 from .controls import Icon
 from .utilus import typename
-from .framework import CtrlInterface, Menu, filling
+from .framework import CtrlInterface, Menu
 
 
 class Inspector(it.InspectionTree, CtrlInterface):
@@ -77,19 +77,16 @@ class Inspector(it.InspectionTree, CtrlInterface):
     ## --------------------------------
     
     def SetObj(self, obj):
-        """Called from tree.toolFrame -> SetObj.
-        
-        (override) Set target object.
-        """
+        """Called from tree.toolFrame -> SetObj."""
         if self.target is obj:
             return
         self.target = obj
-        item = self.FindWidgetItem(obj)
+        item = self.FindWidgetItem(obj)  # cf. it.InspectionTree.SelectObj
         if item:
             self.EnsureVisible(item)
             self.SelectItem(item)
         elif obj:
-            self.BuildTree(obj)
+            self.BuildTree(obj)  # If the item for obj is missing, rebuild the tree.
     
     def GetTextForWidget(self, obj):
         """Return the string to be used in the tree for a widget.
@@ -119,11 +116,11 @@ class Inspector(it.InspectionTree, CtrlInterface):
         if obj is None:
             item = self.Selection
             if item:
-                obj = self.GetItemData(item) # Restart
-        self.BuildTree(obj)
-        if not isinstance(obj, wx.Window):
+                obj = self.GetItemData(item)  # Restart
+        if not isinstance(obj, (wx.Window, type(None))):
             wx.MessageBox("Cannot watch the widget.\n\n"
-                          "- {!r} is not a wx.Object.".format(obj))
+                          "- {!r} is not a wx.Object.".format(obj),
+                          self.__module__)
             return
         self.SetObj(obj)
         self.timer.Start(500)
@@ -137,7 +134,7 @@ class Inspector(it.InspectionTree, CtrlInterface):
     ## --------------------------------
     
     def OnTimer(self, evt):
-        ## wnd, pt = wx.FindWindowAtPointer() # as HitTest
+        ## wnd, pt = wx.FindWindowAtPointer()  # as HitTest
         wnd = wx.Window.FindFocus()
         if (wnd and wnd is not self.target
                 and wnd not in self._noWatchList):
@@ -187,8 +184,8 @@ class Inspector(it.InspectionTree, CtrlInterface):
 
 
 def miniIcon(key, size=(16,16)):
-    if key == 'ShowFilling':
-        return wx.py.filling.images.getPyImage().Scale(16,16).ConvertToBitmap()
+    ## if key == 'ShowFilling':
+    ##     return wx.py.filling.images.getPyImage().Scale(16,16).ConvertToBitmap()
     art = getattr(it, key)
     return art.GetImage().Scale(*size).ConvertToBitmap()
 

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

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

mwxlib-1.4.20.dist-info/RECORD

@@ -0,0 +1,28 @@
+mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
+mwx/bookshelf.py,sha256=XbJ9HUH5COUm-BVI7iLC7gr9Hj9l-sFjOoaCAqNS4aA,8178
+mwx/controls.py,sha256=cgYEeBn1GD1s2YrDZd3jzhlACTc9IOZED_JOA8dqTJI,49914
+mwx/framework.py,sha256=D1KILJNmv-eQ0HY8ayphIA_Fd9K19d6jHA5q27fp61M,77031
+mwx/graphman.py,sha256=sb9Y2z5bW30arFxQnOoMhjxILNUdnAZsDh9rNbY_IPI,70037
+mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
+mwx/matplot2.py,sha256=U0axLQeZAR_ys5rXHykVKkvXLibnNwXS-gm-c0U2MGw,33003
+mwx/matplot2g.py,sha256=foq-NdksvTV_I55UGxLzghp1YXaFfWgzTmigmnIe58E,65376
+mwx/matplot2lg.py,sha256=cb0EZXivccDQu4oFj5ddSUF9pEE4f5UuFJJK2ELItww,27404
+mwx/mgplt.py,sha256=KR7MWdl9J6hiiBdO0NB25Y37rP21aFdwBVsB9KZKXo8,5564
+mwx/nutshell.py,sha256=sAvHbrD9V4lMaeX_h_r8e5VYnhAe47GMRaRzoNJmtV0,146629
+mwx/testsuite.py,sha256=Zk75onPSEn2tf0swS3l-vIn6yTXGB7allIyvJsPHj20,1229
+mwx/utilus.py,sha256=ZcKEkY2jR9pvf0bDFXyKk2Z7dDBf-NW84tDPiBlWdic,38081
+mwx/wxmon.py,sha256=NIksW_CZv7Kw4dod8tWVwakO4iJuvE8hJSAcjkYfLaE,12800
+mwx/wxpdb.py,sha256=aZIH7Xs-9ahDLut2P4NmvbB2zHVpI95kx4je1ophNQM,18799
+mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
+mwx/wxwit.py,sha256=mTH92bWw1F3ycaq4EoxVD_4hIxy2fbKZZbQg3f1ZD1Y,7350
+mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
+mwx/plugins/ffmpeg_view.py,sha256=-xf1Kmu4H5UZRCatqPLfstr2NbnJDZ2_xLfBLV4vczo,11001
+mwx/plugins/fft_view.py,sha256=08A_Y73XirV7kXpwf-v0mUA0Hr0MOfdMXv3tvL1hvWA,2789
+mwx/plugins/frame_listview.py,sha256=xH1au3lI-bZwCzmhVmvNTOHDoVQIBzH4p9_8Y36Qs5U,10380
+mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
+mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
+mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
+mwxlib-1.4.20.dist-info/METADATA,sha256=4uLVWBcmszTutWuvX_2Sv3s4nynp2J6hEXRLo1O-uhU,7382
+mwxlib-1.4.20.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+mwxlib-1.4.20.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.4.20.dist-info/RECORD,,

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

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

mwxlib-1.4.15.dist-info/RECORD

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