mwxlib 1.7.13__py3-none-any.whl → 1.8.0__py3-none-any.whl

mwx/bookshelf.py

@@ -91,24 +91,24 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
             self.parent.handler(self.handler.current_event, evt)
             evt.Skip()
         
-        self.handler.update({ # DNA<EditorTreeCtrl>
+        self.handler.update({  # DNA<EditorTreeCtrl>
             None : {
-             '*button* pressed' : [ None, dispatch ],
-            '*button* released' : [ None, dispatch ],
+             '*button* pressed' : [None, dispatch],
+            '*button* released' : [None, dispatch],
             },
             0 : {
                'delete pressed' : (0, self.on_delete_buffer),
             },
         })
-        self.context = { # DNA<EditorBook>
+        self.context = {  # DNA<EditorBook>
             None : {
-                   'buffer_new' : [ None, self.on_buffer_new ],
-                 'buffer_saved' : [ None, ],
-                'buffer_loaded' : [ None, ],
-               'buffer_deleted' : [ None, self.on_buffer_deleted ],
-             'buffer_activated' : [ None, self.on_buffer_selected ],
-           'buffer_inactivated' : [ None, ],
-       'buffer_caption_updated' : [ None, self.on_buffer_filename ],
+                   'buffer_new' : [None, self.on_buffer_new],
+                 'buffer_saved' : [None, ],
+                'buffer_loaded' : [None, ],
+               'buffer_deleted' : [None, self.on_buffer_deleted],
+             'buffer_activated' : [None, self.on_buffer_selected],
+           'buffer_inactivated' : [None, ],
+       'buffer_caption_updated' : [None, self.on_buffer_filename],
             },
         }
         
@@ -185,7 +185,7 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
     def on_buffer_deleted(self, buf):
         self.Delete(buf.__itemId)
 
-    ## Note: [buffer_activated][EVT_SET_FOCUS] > [buffer_new] の順で呼ばれる．
+    ## Note: [buffer_activated] > [buffer_new] の順で呼ばれる．
     ##       buf.__itemId がない場合がある (delete_buffer 直後など).
     def on_buffer_selected(self, buf):
         if self and buf:

mwx/controls.py

@@ -64,9 +64,9 @@ class Param:
             if isinstance(fmt, str):  # support %-format:str (deprecated)
                 self.__format = lambda v: fmt % v
         self.callback = SSM({
-            'control' : [ _F(handler) ] if handler else [],
-            'updated' : [ _F(updater) ] if updater else [],
-            'checked' : [ _F(checker) ] if checker else [],
+            'control' : [_F(handler)] if handler else [],
+            'updated' : [_F(updater)] if updater else [],
+            'checked' : [_F(checker)] if checker else [],
            'notified' : [],
            'overflow' : [],
           'underflow' : [],
@@ -434,13 +434,13 @@ class Knob(wx.Panel):
     def update_range(self):
         """Called when range is being changed (internal use only)."""
         v = self.__par
-        if isinstance(self._ctrl, wx.Choice):  #<wx.Choice>
+        if isinstance(self._ctrl, wx.Choice):  # <wx.Choice>
             items = [v.__str__(x) for x in v.range]
             if items != self._ctrl.Items:
                 self._ctrl.SetItems(items)
                 self._ctrl.SetStringSelection(str(v))
         else:
-            self._ctrl.SetRange(0, len(v)-1)  #<wx.Slider> #<wx.SpinButton>
+            self._ctrl.SetRange(0, len(v)-1)  # <wx.Slider> <wx.SpinButton>
 
     def update_label(self):
         """Called when label is being changed (internal use only)."""
@@ -494,7 +494,7 @@ class Knob(wx.Panel):
             v.index = j
             v.reset(v.value)
 
-    def OnScroll(self, evt):  #<wx._core.ScrollEvent> #<wx._controls.SpinEvent> #<wx._core.CommandEvent>
+    def OnScroll(self, evt):  # <wx._core.ScrollEvent> <wx._controls.SpinEvent> <wx._core.CommandEvent>
         v = self.__par
         j = self._ctrl.GetValue()
         if j != v.index:
@@ -502,11 +502,11 @@ class Knob(wx.Panel):
             v.reset(v.value)
         evt.Skip()
 
-    def OnMouseWheel(self, evt):  #<wx._core.MouseEvent>
+    def OnMouseWheel(self, evt):  # <wx._core.MouseEvent>
         self._shift_control(evt, (1 if evt.WheelRotation > 0 else -1))
         evt.Skip(False)
 
-    def OnCtrlKeyDown(self, evt):  #<wx._core.KeyEvent>
+    def OnCtrlKeyDown(self, evt):  # <wx._core.KeyEvent>
         key = evt.GetKeyCode()
         if key == wx.WXK_LEFT: return self._shift_control(evt, -1)
         if key == wx.WXK_RIGHT: return self._shift_control(evt, 1)
@@ -521,10 +521,10 @@ class Knob(wx.Panel):
         if key == wx.WXK_DOWN: return any(_focus(c) for c in ls[i+1:])
         if key == wx.WXK_UP: return any(_focus(c) for c in ls[i-1::-1])
 
-    def OnTextKeyUp(self, evt):  #<wx._core.KeyEvent>
+    def OnTextKeyUp(self, evt):  # <wx._core.KeyEvent>
         evt.Skip()
 
-    def OnTextKeyDown(self, evt):  #<wx._core.KeyEvent>
+    def OnTextKeyDown(self, evt):  # <wx._core.KeyEvent>
         key = evt.GetKeyCode()
         if key == wx.WXK_DOWN: return self._shift_control(evt, -1)
         if key == wx.WXK_UP: return self._shift_control(evt, 1)
@@ -532,22 +532,22 @@ class Knob(wx.Panel):
             self.__par.reset(self.__par.value, internal_callback=None)  # restore value
         evt.Skip()
 
-    def OnTextEnter(self, evt):  #<wx._core.CommandEvent>
+    def OnTextEnter(self, evt):  # <wx._core.CommandEvent>
         evt.Skip()
         x = self._text.Value.strip()
         self.__par.reset(x)
 
-    def OnTextExit(self, evt):  #<wx._core.FocusEvent>
+    def OnTextExit(self, evt):  # <wx._core.FocusEvent>
         x = self._text.Value.strip()
         if x != str(self.__par):
             self.__par.reset(x)
         evt.Skip()
 
-    def OnCheck(self, evt):  #<wx._core.CommandEvent>
+    def OnCheck(self, evt):  # <wx._core.CommandEvent>
         self.__par.check = evt.IsChecked()
         evt.Skip()
 
-    def OnPress(self, evt):  #<wx._core.CommandEvent>
+    def OnPress(self, evt):  # <wx._core.CommandEvent>
         self.__par.callback('updated', self.__par)
         evt.Skip()
 
@@ -591,11 +591,11 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
         self.Bind(wx.EVT_MOUSEWHEEL, self.OnRecalcLayout)
         self.Bind(wx.EVT_LEFT_DOWN, self.OnRecalcLayout)
 
-    def OnRecalcLayout(self, evt):  #<wx._core.ScrollWinEvent>
+    def OnRecalcLayout(self, evt):  # <wx._core.ScrollWinEvent>
         self.Layout()
         evt.Skip()
 
-    def OnToggleFold(self, evt):  #<wx._core.MouseEvent>
+    def OnToggleFold(self, evt):  # <wx._core.MouseEvent>
         x, y = evt.Position
         for child in self.Sizer.Children:  # child <wx._core.SizerItem>
             if child.IsShown():
@@ -736,7 +736,7 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
             except AttributeError:
                 p.value = v
             except Exception as e:
-                print(f"- Failed to eval {v}:", e)
+                print(f"- Failed to eval {v};", e)
 
     def reset_params(self, checked_only=False):
         params = self.get_params(checked_only)
@@ -928,7 +928,7 @@ class Icon(wx.Bitmap):
                 key = (key.ConvertToImage()
                           .Scale(*size, wx.IMAGE_QUALITY_NEAREST)
                           .ConvertToBitmap())
-            return key  #<wx.Bitmap>
+            return key  # <wx.Bitmap>
         if size is None:
             size = (16, 16)
         if key:
@@ -1094,7 +1094,7 @@ class TextBox(wx.Control):
         **kwargs: keywords for wx.TextCtrl
                   e.g., value:str
     """
-    Value = property( # textctrl value:str
+    Value = property(  # textctrl value:str
         lambda self: self._ctrl.GetValue(),
         lambda self, v: self._ctrl.SetValue(v))
 
@@ -1162,17 +1162,17 @@ class Choice(wx.Control):
         If the input item is not found in the choices,
         it will be added to the list (unless readonly)
     """
-    Value = property( # combobox value:str
+    Value = property(  # combobox value:str
         lambda self: self._ctrl.GetValue(),
         lambda self, v: self._ctrl.SetValue(v))
 
     value = Value  # internal use only
 
-    Selection = property( # combobox selection:int or NOT_FOUND(-1)
+    Selection = property(  # combobox selection:int or NOT_FOUND(-1)
         lambda self: self._ctrl.GetSelection(),
         lambda self, v: self._ctrl.SetSelection(v))
 
-    Items = property( # combobox items:list
+    Items = property(  # combobox items:list
         lambda self: self._ctrl.GetItems(),
         lambda self, v: self._ctrl.SetItems(v))
 

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.7.13"
+__version__ = "1.8.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -246,17 +246,17 @@ class KeyCtrlInterfaceMixin:
         
         assert state is not None, "Don't make keymap for None:state"
         
-        self.handler.update({ # DNA<KeyCtrlInterfaceMixin>
+        self.handler.update({  # DNA<KeyCtrlInterfaceMixin>
             state : {
-                          event : [ keymap, self.pre_command_hook ],
+                          event : [keymap, self.pre_command_hook],
             },
             keymap : {
-                         'quit' : [ state, ],
-                    '* pressed' : [ state, self.post_command_hook ],
-                 '*alt pressed' : [ keymap, _Pass ],
-                '*ctrl pressed' : [ keymap, _Pass ],
-               '*shift pressed' : [ keymap, _Pass ],
-             '*[LR]win pressed' : [ keymap, _Pass ],
+                         'quit' : [state, ],
+                    '* pressed' : [state, self.post_command_hook],
+                 '*alt pressed' : [keymap, _Pass],
+                '*ctrl pressed' : [keymap, _Pass],
+               '*shift pressed' : [keymap, _Pass],
+             '*[LR]win pressed' : [keymap, _Pass],
             },
         })
 
@@ -338,7 +338,7 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
         self.__key = ''
         self.__button = ''
         self.__isDragging = False
-        self.__handler = FSM({ # DNA<CtrlInterface>
+        self.__handler = FSM({  # DNA<CtrlInterface>
                 None : {
                 },
                 0 : {
@@ -350,15 +350,17 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
         _N = self._normal_handler
         
         def activate(evt):
-            self.handler('focus_set', evt)
+            if self:
+                self.handler('focus_set', evt)
             evt.Skip()
         self.Bind(wx.EVT_SET_FOCUS, activate)
         
         def inactivate(evt):
-            self.__key = ''
-            self.__button = ''
-            self.__isDragging = False
-            self.handler('focus_kill', evt)
+            if self:
+                self.__key = ''
+                self.__button = ''
+                self.__isDragging = False
+                self.handler('focus_kill', evt)
             evt.Skip()
         self.Bind(wx.EVT_KILL_FOCUS, inactivate)
         
@@ -390,7 +392,7 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
         self.Bind(wx.EVT_MOUSE_CAPTURE_LOST, lambda v: _N('capture_lost', v))
         self.Bind(wx.EVT_MOUSE_CAPTURE_CHANGED, lambda v: _N('capture_changed', v))
 
-    def on_hotkey_press(self, evt):  #<wx._core.KeyEvent>
+    def on_hotkey_press(self, evt):  # <wx._core.KeyEvent>
         """Called when a key is pressed."""
         # if evt.EventObject is not self:
         #     evt.Skip()
@@ -400,7 +402,7 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
         if self.handler('{} pressed'.format(key), evt) is None:
             evt.Skip()
 
-    def on_hotkey_down(self, evt): #<wx._core.KeyEvent>
+    def on_hotkey_down(self, evt):  # <wx._core.KeyEvent>
         """Called when a key is pressed while dragging.
         Specifically called when the mouse is being captured.
         """
@@ -409,14 +411,14 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
         else:
             evt.Skip()
 
-    def on_hotkey_up(self, evt):  #<wx._core.KeyEvent>
+    def on_hotkey_up(self, evt):  # <wx._core.KeyEvent>
         """Called when a key is released."""
         key = hotkey(evt)
         self.__key = ''
         if self.handler('{} released'.format(key), evt) is None:
             evt.Skip()
 
-    def on_mousewheel(self, evt):  #<wx._core.MouseEvent>
+    def on_mousewheel(self, evt):  # <wx._core.MouseEvent>
         """Called on mouse wheel events.
         Trigger event: 'key+wheel[up|down|right|left] pressed'
         """
@@ -428,7 +430,7 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
         if self.handler('{} pressed'.format(evt.key), evt) is None:
             evt.Skip()
 
-    def on_motion(self, evt):  #<wx._core.MouseEvent>
+    def on_motion(self, evt):  # <wx._core.MouseEvent>
         """Called on mouse motion events.
         Trigger event: 'key+[LMR]drag begin/motion/end'
         """
@@ -443,7 +445,7 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
             self.handler('motion', evt)
         evt.Skip()
 
-    def _mouse_handler(self, event, evt):  #<wx._core.MouseEvent>
+    def _mouse_handler(self, event, evt):  # <wx._core.MouseEvent>
         """Called on mouse button events.
         Trigger event: 'key+[LMRX]button pressed/released/dblclick'
         """
@@ -467,7 +469,7 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
         except AttributeError:
             pass
 
-    def _normal_handler(self, event, evt):  #<wx._core.Event>
+    def _normal_handler(self, event, evt):  # <wx._core.Event>
         if self.handler(event, evt) is None:
             evt.Skip()
 
@@ -767,7 +769,7 @@ class Frame(wx.Frame, KeyCtrlInterfaceMixin):
                     evt.Skip()
         self.Bind(wx.EVT_CHAR_HOOK, hook_char)
         
-        self.__handler = FSM({ # DNA<Frame>
+        self.__handler = FSM({  # DNA<Frame>
                 None : {
                 },
                 0 : {
@@ -821,7 +823,7 @@ class MiniFrame(wx.MiniFrame, KeyCtrlInterfaceMixin):
         ## To default close >>> self.Unbind(wx.EVT_CLOSE).
         self.Bind(wx.EVT_CLOSE, lambda v: self.Show(0))
         
-        self.__handler = FSM({ # DNA<MiniFrame>
+        self.__handler = FSM({  # DNA<MiniFrame>
                 None : {
                 },
                 0 : {
@@ -847,7 +849,7 @@ class AuiNotebook(aui.AuiNotebook):
             self.Name = name
         
         def tab_menu(evt):
-            tabs = evt.EventObject  #<AuiTabCtrl>
+            tabs = evt.EventObject  # <AuiTabCtrl>
             page = tabs.Pages[evt.Selection]  # GetPage for split notebook.
             try:
                 Menu.Popup(self, page.window.menu)
@@ -906,8 +908,8 @@ class AuiNotebook(aui.AuiNotebook):
         Note:
             Argument `win` can also be page.window.Name (not page.caption).
         """
-        for tab in self._all_tabs:  #<aui.AuiTabCtrl>
-            for page in tab.Pages:  #<aui.AuiNotebookPage>
+        for tab in self._all_tabs:  # <aui.AuiTabCtrl>
+            for page in tab.Pages:  # <aui.AuiNotebookPage>
                 ## if page.window is win or page.caption == win:
                 if page.window is win or page.window.Name == win:
                     return tab, page
@@ -988,7 +990,7 @@ class AuiNotebook(aui.AuiNotebook):
             self._mgr.LoadPerspective(frames)
             self._mgr.Update()
         except Exception as e:
-            print("- Failed to load perspective.", e)
+            print("- Failed to load perspective;", e)
         finally:
             self.Parent.Thaw()
 
@@ -1237,21 +1239,21 @@ class ShellFrame(MiniFrame):
                     self.indicator.Value = 7
             evt.Skip()
         
-        self.handler.update({ # DNA<ShellFrame>
+        self.handler.update({  # DNA<ShellFrame>
             None : {
-                  'debug_begin' : [ None, self.on_debug_begin ],
-                   'debug_next' : [ None, self.on_debug_next ],
-                    'debug_end' : [ None, self.on_debug_end ],
-                  'trace_begin' : [ None, self.on_trace_begin ],
-                   'trace_hook' : [ None, self.on_trace_hook ],
-                    'trace_end' : [ None, self.on_trace_end ],
-                'monitor_begin' : [ None, self.on_monitor_begin ],
-                  'monitor_end' : [ None, self.on_monitor_end ],
-                    'shell_new' : [ None, ],
-                     'book_new' : [ None, ],
-                      'add_log' : [ None, self.add_log ],
-                     'add_help' : [ None, self.add_help ],
-                 'title_window' : [ None, self.on_title_window ],
+                  'debug_begin' : [None, self.on_debug_begin],
+                   'debug_next' : [None, self.on_debug_next],
+                    'debug_end' : [None, self.on_debug_end],
+                  'trace_begin' : [None, self.on_trace_begin],
+                   'trace_hook' : [None, self.on_trace_hook],
+                    'trace_end' : [None, self.on_trace_end],
+                'monitor_begin' : [None, self.on_monitor_begin],
+                  'monitor_end' : [None, self.on_monitor_end],
+                    'shell_new' : [None, ],
+                     'book_new' : [None, ],
+                      'add_log' : [None, self.add_log],
+                     'add_help' : [None, self.add_help],
+                 'title_window' : [None, self.on_title_window],
             },
             0 : {
                     '* pressed' : (0, fork_debugger),
@@ -1303,7 +1305,7 @@ class ShellFrame(MiniFrame):
         except FileNotFoundError:
             pass
         except Exception as e:
-            print("- Failed to load session:", e)
+            print("- Failed to load session;", e)
         self.SESSION_FILE = session
         
         ## Reposition the window if it is not on the desktop.
@@ -1405,7 +1407,7 @@ class ShellFrame(MiniFrame):
 
     def OnClose(self, evt):
         if self.debugger.busy:
-            if wx.MessageBox( # Confirm closing the debugger.
+            if wx.MessageBox(  # Confirm closing the debugger.
                     "The debugger is running.\n\n"
                     "Enter [q]uit to exit before closing.\n"
                     "Continue closing?",
@@ -1426,7 +1428,7 @@ class ShellFrame(MiniFrame):
                 if buf.need_buffer_save:
                     self.popup_window(book)
                     buf.SetFocus()
-                    if wx.MessageBox( # Confirm closing the buffer.
+                    if wx.MessageBox(  # Confirm closing the buffer.
                             "You are closing unsaved content.\n\n"
                             "Changes to the content will be discarded.\n"
                             "Continue closing?",
@@ -1488,7 +1490,7 @@ class ShellFrame(MiniFrame):
             self.inspector.unwatch()
         evt.Skip()
 
-    def OnConsolePageChanged(self, evt):  #<wx._aui.AuiNotebookEvent>
+    def OnConsolePageChanged(self, evt):  # <wx._aui.AuiNotebookEvent>
         nb = evt.EventObject
         win = nb.CurrentPage
         if win is self.rootshell:
@@ -1498,7 +1500,7 @@ class ShellFrame(MiniFrame):
         nb.TabCtrlHeight = 0 if nb.PageCount == 1 else -1
         evt.Skip()
 
-    def OnConsolePageClose(self, evt):  #<wx._aui.AuiNotebookEvent>
+    def OnConsolePageClose(self, evt):  # <wx._aui.AuiNotebookEvent>
         nb = evt.EventObject
         win = list(nb.get_pages())[evt.Selection]
         if win is self.rootshell:
@@ -1515,20 +1517,20 @@ class ShellFrame(MiniFrame):
     def About(self, evt=None):
         self.add_help(
             '\n\n'.join((
-                f"#<module 'mwx' from {__file__!r}>",
+                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> --->
-                f"#{wx.py!r}",
+                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> --->
-                ## f"#{wx!r}".format(wx),
-                ## f"To show the credit, press [C-M-Mbutton].",  # cf. wx.InfoMessageBox(None)
+                # f"#{wx!r}",
+                # f"To show the credit, press [C-M-Mbutton].",  # cf. wx.InfoMessageBox(None)
                 ))
             )
 
@@ -1700,7 +1702,7 @@ class ShellFrame(MiniFrame):
         if not self:
             return
         shell = self.debugger.interactive_shell
-        shell.write("#<-- Enter [n]ext to continue.\n", -1)
+        shell.write("# <-- Enter [n]ext to continue.\n", -1)
         shell.prompt()
         shell.SetFocus()
         self.Show()
@@ -1737,7 +1739,7 @@ class ShellFrame(MiniFrame):
         if not self:
             return
         shell = self.debugger.interactive_shell
-        shell.write("#--> Debugger closed successfully.\n", -1)
+        shell.write("# --> Debugger closed successfully.\n", -1)
         shell.prompt()
         self.add_log("--> End of debugger\r\n")
         self.linfo.unwatch()
@@ -1926,6 +1928,7 @@ class ShellFrame(MiniFrame):
                 self.ghost.AddPage(editor, bookname)
                 self.ghost.move_tab(editor, 0)
             self.handler('book_new', editor)
+            
             def _attach():
                 editor.handler.append(self.Bookshelf.context)
                 self.Bookshelf.build_tree(clear=0)
@@ -1964,7 +1967,7 @@ class ShellFrame(MiniFrame):
     def repeat_backward_search(self, evt):
         self.OnFindNext(evt, backward=True)
 
-    def OnFindNext(self, evt, backward=None):  #<wx._core.FindDialogEvent>
+    def OnFindNext(self, evt, backward=None):  # <wx._core.FindDialogEvent>
         if not self.findData.FindString:
             self.message("No last search.")
             return
@@ -1995,7 +1998,7 @@ class ShellFrame(MiniFrame):
         if loc < 0:
             self.message("Unable to find the search text.")
 
-    def OnFindClose(self, evt):  #<wx._core.FindDialogEvent>
+    def OnFindClose(self, evt):  # <wx._core.FindDialogEvent>
         self.findDlg.Destroy()
         self.findDlg = None