mwxlib 0.94.4__py3-none-any.whl → 0.94.6__py3-none-any.whl

mwx/bookshelf.py

@@ -27,7 +27,7 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
                'buffer_deleted' : [ None, self.on_buffer_deleted ],
              'buffer_activated' : [ None, self.on_buffer_selected ],
            'buffer_inactivated' : [ None, ],
-         'buffer_caption_reset' : [ None, self.on_buffer_caption ],
+         'buffer_caption_reset' : [ None, self.on_buffer_filename ],
         'buffer_filename_reset' : [ None, self.on_buffer_filename ],
             },
         }
@@ -44,7 +44,7 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         
         @self.handler.bind('f5 pressed')
         def refresh(v):
-            self.update(clear=0)
+            self.build_tree(clear=0)
             if self.target:
                 self.target.current_editor.SetFocus()
                 wx.CallAfter(self.SetFocus)
@@ -73,7 +73,7 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         self.target = target
         for editor in self.target.all_editors:
             editor.handler.append(self.context)
-        self.update()
+        self.build_tree()
     
     def detach(self):
         if not self.target:
@@ -81,26 +81,23 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
         for editor in self.target.all_editors:
             editor.handler.remove(self.context)
         self.target = None
-        self.update()
+        self.build_tree()
     
     ## --------------------------------
     ## TreeList/Ctrl wrapper interface 
     ## --------------------------------
     
-    def update(self, clear=True):
+    def build_tree(self, clear=True):
         """Build tree control.
         All items will be cleared if specified.
         """
-        try:
-            self.Freeze()
-            if clear:
-                self.DeleteAllItems()
-                self.AddRoot(self.Name)
-            if self.target:
-                for editor in self.target.all_editors:
-                    self._set_item(self.RootItem, editor.Name, editor.all_buffers)
-        finally:
-            self.Thaw()
+        if clear:
+            self.DeleteAllItems()
+            self.AddRoot(self.Name)
+        if self.target:
+            for editor in self.target.all_editors:
+                self._set_item(self.RootItem, editor.Name, editor.all_buffers)
+        self.Refresh()
     
     def _get_item(self, root, key):
         """Returns the first item [root/key] found.
@@ -129,11 +126,11 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
     ## Actions for bookshelf interfaces
     ## --------------------------------
     
-    @postcall
+    ## @postcall
     def on_buffer_new(self, buf):
-        self.update(clear=0)
+        self.build_tree(clear=0)
     
-    @postcall
+    ## @postcall
     def on_buffer_deleted(self, buf):
         self.Delete(buf.__itemId)
     
@@ -141,10 +138,6 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
     def on_buffer_selected(self, buf):
         self.SelectItem(buf.__itemId)
     
-    @postcall
-    def on_buffer_caption(self, buf):
-        self.SetItemText(buf.__itemId, buf.caption_prefix + buf.name)
-    
     @postcall
     def on_buffer_filename(self, buf):
         self.SetItemText(buf.__itemId, buf.caption_prefix + buf.name)

mwx/controls.py

@@ -741,7 +741,7 @@ class ControlPanel(scrolled.ScrolledPanel):
                 except AttributeError:
                     p.value = v
                 except Exception as e: # failed to eval
-                    print("- Failed to reset {!r}: {}".format(p, e))
+                    print(f"- Failed to reset {p!r}:", e)
                     pass
     
     reset_params = set_params #: for backward compatibility

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.94.4"
+__version__ = "0.94.6"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -13,7 +13,6 @@ import builtins
 import datetime
 import textwrap
 import time
-import sys
 import os
 import re
 import wx
@@ -47,8 +46,6 @@ def deb(target=None, loop=True, locals=None, **kwargs):
     Note:
         This will execute the startup script $(PYTHONSTARTUP).
     """
-    import wx
-    
     quote_unqoute = """
         Anything one man can imagine, other man can make real.
         --- Jules Verne (1828--1905)
@@ -297,12 +294,14 @@ class KeyCtrlInterfaceMixin:
         key += ' pressed'
         
         if map not in self.handler:
-            warnings.warn(f"New map to define_key {keymap!r} in {self}.", stacklevel=2)
+            warnings.warn(f"New map to define_key {keymap!r} in {self}.",
+                          stacklevel=2)
             self.make_keymap(map) # make new keymap
         
         transaction = self.handler[map].get(key, [state])
         if len(transaction) > 1:
-            warnings.warn(f"Duplicate define_key {keymap!r} in {self}.", stacklevel=2)
+            warnings.warn(f"Duplicate define_key {keymap!r} in {self}.",
+                          stacklevel=2)
         
         if action is None:
             self.handler[map].pop(key, None) # cf. undefine_key
@@ -328,7 +327,8 @@ class CtrlInterface(KeyCtrlInterfaceMixin):
     
     def __init__(self):
         if hasattr(self, 'handler'):
-            warnings.warn(f"Duplicate iniheritance of CtrlInterface by {self}.", stacklevel=2)
+            warnings.warn(f"Duplicate iniheritance of CtrlInterface by {self}.",
+                          stacklevel=2)
             return
         self.__key = ''
         self.__button = ''
@@ -633,7 +633,8 @@ class MenuBar(wx.MenuBar, TreeList):
         Call when the menulist is changed.
         """
         if not self.Parent:
-            warnings.warn(f"No parents bound to {self}.", stacklevel=2)
+            warnings.warn(f"No parents bound to {self}.",
+                          stacklevel=2)
             return
         
         menu = self.getmenu(key)
@@ -660,7 +661,8 @@ class MenuBar(wx.MenuBar, TreeList):
         Call when the menulist is changed.
         """
         if not self.Parent:
-            warnings.warn(f"No parents bound to {self}.", stacklevel=2)
+            warnings.warn(f"No parents bound to {self}.",
+                          stacklevel=2)
             return
         
         for j in range(self.GetMenuCount()): # remove and del all top-level menu
@@ -1004,7 +1006,7 @@ class AuiNotebook(aui.AuiNotebook):
                 pane.name = f"pane{j+1}"
             self._mgr.LoadPerspective(frames)
             self._mgr.Update()
-        except Exception:
+        except Exception as e:
             print("- Failed to load perspective:", e)
         finally:
             self.Parent.Thaw()
@@ -1176,15 +1178,18 @@ class ShellFrame(MiniFrame):
         self._mgr.SetDockSizeConstraint(0.5, 0.5) # (w, h)/N
         
         self._mgr.AddPane(self.console,
-                          aui.AuiPaneInfo().Name("console").CenterPane().Show(1))
+                          aui.AuiPaneInfo().Name("console").CenterPane()
+                             .MaximizeButton().Show(1))
         
         self._mgr.AddPane(self.ghost,
                           aui.AuiPaneInfo().Name("ghost")
-                             .Caption("Ghost in the Shell").Right().Show(0))
+                             .Caption("Ghost in the Shell").Right()
+                             .MaximizeButton().Show(0))
         
         self._mgr.AddPane(self.watcher,
                           aui.AuiPaneInfo().Name("watcher")
-                             .Caption("Watchdog in the Shell").Right().Position(1).Show(0))
+                             .Caption("Watchdog in the Shell").Right().Position(1)
+                             .MaximizeButton().Show(0))
         
         self._mgr.Update()
         
@@ -1264,35 +1269,30 @@ class ShellFrame(MiniFrame):
             },
         })
         
-        ## py-mode
         self.Scratch.set_attributes(Style=Nautilus.STYLE)
+        self.Log.set_attributes(ReadOnly=True)
+        self.Help.set_attributes(ReadOnly=True)
         
         self.set_hookable(self.Scratch)
+        self.set_hookable(self.Log)
         
         @self.Scratch.define_key('C-j')
-        @postcall
         def eval_line():
             shell = self.current_shell
             self.Scratch.buffer.py_eval_line(shell.globals, shell.locals)
         
         @self.Scratch.define_key('C-S-j')
-        @postcall
         def eval_buffer():
             shell = self.current_shell
             self.Scratch.buffer.py_exec_region(shell.globals, shell.locals)
         
-        ## text-mode
-        self.set_hookable(self.Log)
+        ## Session
+        self.SESSION_FILE = get_rootpath(".debrc")
+        self.SCRATCH_FILE = get_rootpath("scratch.py")
+        self.LOGGING_FILE = get_rootpath("deb-logging.log")
         
-        self.Log.set_attributes(ReadOnly=True)
-        self.Help.set_attributes(ReadOnly=True)
-        
-        self.load_session(
-            os.path.abspath(debrc) if debrc else self.SESSION_FILE)
-        
-    SESSION_FILE = get_rootpath(".debrc")
-    SCRATCH_FILE = get_rootpath("scratch.py")
-    LOGGING_FILE = get_rootpath("deb-logging.log")
+        wx.CallAfter(self.load_session,
+                     os.path.abspath(debrc) if debrc else self.SESSION_FILE)
     
     def load_session(self, filename):
         """Load session from file."""
@@ -1304,14 +1304,11 @@ class ShellFrame(MiniFrame):
             except Exception:
                 pass
         
-        for book in self.all_editors:
-            book.delete_all_buffers() # Note: *log* is also flushed.
+        _fload(self.Scratch, self.SCRATCH_FILE) # restore scratch
         
         ## Re-open the *log* file.
         self.add_log("#! Opened: <{}>\r\n".format(datetime.datetime.now()))
         
-        _fload(self.Scratch, self.SCRATCH_FILE) # restore scratch
-        
         fn = os.path.abspath(filename)
         try:
             with open(fn, encoding='utf-8', newline='') as i:
@@ -1351,9 +1348,9 @@ class ShellFrame(MiniFrame):
                 "self.ghost.SetSelection({})".format(self.ghost.Selection),
                 "self.watcher.SetSelection({})".format(self.watcher.Selection),
                 ## Note: Perspectives should be called after all pages have been added.
-                "wx.CallAfter(self._mgr.LoadPerspective, {!r})".format(self._mgr.SavePerspective()),
-                "wx.CallAfter(self.ghost.loadPerspective, {!r})".format(self.ghost.savePerspective()),
-                "wx.CallAfter(self.watcher.loadPerspective, {!r})".format(self.watcher.savePerspective()),
+                "self._mgr.LoadPerspective({!r})".format(self._mgr.SavePerspective()),
+                "self.ghost.loadPerspective({!r})".format(self.ghost.savePerspective()),
+                "self.watcher.loadPerspective({!r})".format(self.watcher.savePerspective()),
                 "self._mgr.Update()\n",
             )))
     

mwx/graphman.py

@@ -413,7 +413,7 @@ class LayerInterface(CtrlInterface):
         try:
             if session:
                 self.load_session(session)
-        except Exception as e:
+        except Exception:
             traceback.print_exc()
             print("- Failed to load session of", self)
     
@@ -473,7 +473,7 @@ class LayerInterface(CtrlInterface):
             if canvas:
                 canvas.draw_idle()
         except Exception as e:
-            print("- Failed to draw Arts of {}: {}".format(self.__module__, e))
+            print(f"- Failed to draw Arts of {self.__module__}:", e)
             del self.Arts
 
 
@@ -1055,7 +1055,8 @@ class Frame(mwx.Frame):
         
         if issubclass(cls, LayerInterface):
             cls.__module__ = module.__name__ # __main__ to module
-            warnings.warn(f"Duplicate iniheritance of LayerInterface by {cls}.", stacklevel=2)
+            warnings.warn(f"Duplicate iniheritance of LayerInterface by {cls}.",
+                          stacklevel=2)
             module.Plugin = cls
             return cls
         
@@ -1099,13 +1100,14 @@ class Frame(mwx.Frame):
             else:
                 module = import_module(name)
         except Exception as e:
-            print("- Unable to load {!r}: {}".format(root, e))
+            print(f"- Unable to load {root!r}:", e)
             return False
         
         ## the module must have a class `Plugin`.
         if not hasattr(module, 'Plugin'):
             if isinstance(root, type):
-                warnings.warn(f"Use dummy plug for debugging {name!r}.", stacklevel=3)
+                warnings.warn(f"Use dummy plug for debugging {name!r}.",
+                              stacklevel=3)
                 module.__dummy_plug__ = root
                 self.register(root, module)
         else:
@@ -1154,7 +1156,7 @@ class Frame(mwx.Frame):
             try:
                 if session:
                     plug.load_session(session)
-            except Exception as e:
+            except Exception:
                 traceback.print_exc()
                 print("- Failed to load session of", plug)
             return None

mwx/nutshell.py

@@ -1891,10 +1891,10 @@ class EditorBook(AuiNotebook, CtrlInterface):
             self.Freeze()
             buf = Buffer(self, filename, style=wx.BORDER_DEFAULT)
             self.set_attributes(buf, **self.defaultBufferStyle)
-            self.handler('buffer_new', buf)
             if index is None:
                 index = self.PageCount
             self.InsertPage(index, buf, buf.name)
+            self.handler('buffer_new', buf)
             return buf
         finally:
             self.Thaw()
@@ -1995,7 +1995,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     return True
                 return False
         except Exception as e:
-            self.post_message("Failed to load {!r}: {}".format(buf.name, e))
+            self.post_message(f"Failed to load {filename!r}:", e)
             self.delete_buffer(buf)
             if org:
                 self.swap_buffer(org)
@@ -2031,7 +2031,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 return True
             return False
         except Exception as e:
-            self.post_message("Failed to save {!r}: {}".format(buf.name, e))
+            self.post_message(f"Failed to save {filename!r}:", e)
             return False
     
     def load_buffer(self, buf=None):

mwx/utilus.py

@@ -35,6 +35,8 @@ def ignore(*category):
     with warnings.catch_warnings():
         warnings.simplefilter("ignore", category)
         yield
+
+
 def atom(v):
     return not hasattr(v, '__name__')
 

mwx/wxwit.py

@@ -71,14 +71,6 @@ class Inspector(it.InspectionTree, CtrlInterface):
     ## InspectionTree wrapper interface
     ## --------------------------------
     
-    def BuildTree(self, *args, **kwargs):
-        """(override)"""
-        try:
-            self.Freeze()
-            it.InspectionTree.BuildTree(self, *args, **kwargs)
-        finally:
-            self.Thaw()
-    
     def SetObj(self, obj):
         """Called from tree.toolFrame -> SetObj."""
         if self.target is obj:

{mwxlib-0.94.4.dist-info → mwxlib-0.94.6.dist-info}/METADATA

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

{mwxlib-0.94.4.dist-info → mwxlib-0.94.6.dist-info}/RECORD

@@ -1,19 +1,19 @@
 mwx/__init__.py,sha256=zLsXDgqyC5NsPCjRxjS2huvZ3uDyeOJ1vapotqe2ULM,834
-mwx/bookshelf.py,sha256=OWeEXMqdSF1IqAKV15TnZ_R5578AV5VDyaB7CWd2sjs,5258
-mwx/controls.py,sha256=1eguX5eofsA6hmS2y7R4hvlFjFikVoZ8v2S1ES7rjEU,47196
-mwx/framework.py,sha256=3Yn4lK7_qnafFitJGTtdRHetZmdxFms-PVDpOdX4kWY,75522
-mwx/graphman.py,sha256=UsNBo5Z1eiuXj3VkxCZds_Uy8R0cQV7mXoCwLtejbCE,70001
+mwx/bookshelf.py,sha256=UVVIwHaGO4aEHwZ8x5SKjpL-3MmQ1s6kkyuyRZqKWvU,5070
+mwx/controls.py,sha256=prp1NhZqv1XANhi2PPxW9jtrgwj_02XMOOyyzZ48klM,47185
+mwx/framework.py,sha256=Wxpr9WDshKkKG4x91POCHgU2TZoFhW9X4U8O6Lbxnck,75581
+mwx/graphman.py,sha256=9MG0BzQh5lDDadyPPXps2M0hf6mPN3G0MQbBGdplY_I,70027
 mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
 mwx/matplot2.py,sha256=qaF_gvLoLn-TimLbRR59KUavNr1ZpZQdSMqjzJk47rk,32682
 mwx/matplot2g.py,sha256=mDaD367wjq6xsyIDX9ot8jLwYYGayoavWMhqsQVBHac,65442
 mwx/matplot2lg.py,sha256=tg8u7w4DxiJdPN-E197NOmbQpc_1gZkgDHYv_xUhbFA,27224
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=tlpYJEpe9sRSnILZBHqu85kQ0VGzTGeLT4PpRDcJPno,135647
-mwx/utilus.py,sha256=5GVSNKyvNWxsDftIrTJUhBlnQAh3zvrW5BuQSGasJv8,37395
+mwx/nutshell.py,sha256=qz4qnEuGm5vEUtltux6caBLAoth92qc1zAyEmL6nbCg,135625
+mwx/utilus.py,sha256=FTJhVFmx6TAE5rvZ_nfxZgyyaW4zMpXEz74v72X6m7Y,37399
 mwx/wxmon.py,sha256=Qk86VbuuW2rR46pqEYLur13G_aloWz5SVv6sib30YY0,12717
 mwx/wxpdb.py,sha256=2z3ZD9Oo1H-ONBHlaprkB9hrTmAI7o03sqO46ppEFE4,19129
 mwx/wxwil.py,sha256=JK1du4i1RVMbDLqN8jLRDSu_JhKEp4mhHVMElzo4yoE,5578
-mwx/wxwit.py,sha256=2gFHi-8nwWRh26RdvZ_AUP--8PDjJB8TUU72y2fBUWM,7557
+mwx/wxwit.py,sha256=MQxXR6VqqT25K6dTQ1U_42SMq1yJT6y54xrMq-OMOaQ,7334
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
 mwx/plugins/ffmpeg_view.py,sha256=vUYNybIJsF1JGkDzjBgDyBQvDh8e1oKHlEMY5Fwc8L4,9399
 mwx/plugins/fft_view.py,sha256=evj2kCe6N10JQczW8IajgLVrUWOihQaHQ2xiBzAsAl4,2675
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=T-2xSv_D2bk9fJ64aiSEe1rJRTeqaIpLVAYEUXW5vz8
 mwx/plugins/line_profile.py,sha256=WJB5z7F53yg4dII2R36IFZvtkSOGWT669b1HmAAXSnQ,816
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwxlib-0.94.4.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.94.4.dist-info/METADATA,sha256=kgPD9dBMgo_dMK-YF1Fye0nl2LqFpduWFVt9EgdXn7c,1925
-mwxlib-0.94.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.94.4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.94.4.dist-info/RECORD,,
+mwxlib-0.94.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.94.6.dist-info/METADATA,sha256=jTXP1YrO9TOtK_CcgwIuZpoMNSKJ8H-VGmRfiqYoJgY,1925
+mwxlib-0.94.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mwxlib-0.94.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.94.6.dist-info/RECORD,,