mwxlib 1.4.11__py3-none-any.whl → 1.4.12__py3-none-any.whl

mwx/bookshelf.py

@@ -115,6 +115,7 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
                     editor.handler.append(self.context)
                 self.build_tree()
         wx.CallAfter(_attach)
+        wx.CallAfter(self.ExpandAll)
     
     def OnDestroy(self, evt):
         if self and self.parent:

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.4.11"
+__version__ = "1.4.12"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -24,7 +24,7 @@ from .utilus import get_rootpath, ignore, warn
 from .utilus import FSM, TreeList, apropos, typename, where, mro, pp
 
 
-def deb(target=None, loop=True, locals=None, debrc=None, **kwargs):
+def deb(target=None, loop=True, locals=None, **kwargs):
     """Dive into the process.
     
     Args:
@@ -32,17 +32,15 @@ def deb(target=None, loop=True, locals=None, debrc=None, **kwargs):
                   If None, the target is set to `__main__`.
         loop    : If True, the app and the mainloop will be created.
         locals  : Additional context of the shell
-        debrc   : file name of the session. Defaults to None.
-                  If None, no session will be created or saved.
-                  If `''`, the default session (.debrc) will be loaded.
         
-        **kwargs: Nautilus ShellFrame arguments
+        **kwargs: ShellFrame and Nautilus arguments
         
+            - session           : file name of the session. Defaults to None.
+            - ensureClose       : True => EVT_CLOSE will close the window.
+                                  False => EVT_CLOSE will hide the window.
             - introText         : introductory of the shell
             - startupScript     : startup script file (default None)
             - execStartupScript : True => Execute the startup script.
-            - ensureClose       : True => EVT_CLOSE will close the window.
-                                  False => EVT_CLOSE will hide the window.
     
     Note:
         This will execute the startup script $(PYTHONSTARTUP).
@@ -50,9 +48,13 @@ def deb(target=None, loop=True, locals=None, debrc=None, **kwargs):
     kwargs.setdefault("introText", f"mwx {__version__}\n")
     kwargs.setdefault("execStartupScript", True)
     kwargs.setdefault("ensureClose", True)
-
+    
+    if "debrc" in kwargs: # for backward compatibility
+        warn("Deprecated keyword: 'debrc'. Use 'session' instead.", DeprecationWarning)
+        kwargs.setdefault('session', kwargs.pop('debrc'))
+    
     app = wx.GetApp() or wx.App()
-    frame = ShellFrame(None, target, session=debrc, **kwargs)
+    frame = ShellFrame(None, target, **kwargs)
     frame.Show()
     frame.rootshell.SetFocus()
     if locals:
@@ -1256,8 +1258,8 @@ class ShellFrame(MiniFrame):
                   'C-f pressed' : (0, self.OnFindText),
                    'f3 pressed' : (0, self.OnFindNext),
                  'S-f3 pressed' : (0, self.OnFindPrev),
-                  'f11 pressed' : (0, _F(self.toggle_window, self.ghost, alias='toggle_ghost')),
-                'S-f11 pressed' : (0, _F(self.toggle_window, self.watcher, alias='toggle_watcher')),
+                  '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")),
              '*f[0-9]* pressed' : (0, ),
             },

mwx/graphman.py

@@ -353,9 +353,9 @@ class LayerInterface(CtrlInterface):
                    'thread_end' : [ None ], # end processing
                   'thread_quit' : [ None ], # terminated by user
                  'thread_error' : [ None ], # failed in error
-                   'page_shown' : [ None, _F(self.Draw, True)  ],
-                  'page_closed' : [ None, _F(self.Draw, False) ],
-                  'page_hidden' : [ None, _F(self.Draw, False) ],
+                   'page_shown' : [ None, _F(self.Draw, show=True)  ],
+                  'page_closed' : [ None, _F(self.Draw, show=False) ],
+                  'page_hidden' : [ None, _F(self.Draw, show=False) ],
             },
             0 : {
                   'C-c pressed' : (0, _F(copy_params)),

mwx/matplot2g.py

@@ -419,8 +419,8 @@ class GraphPlot(MatplotPanel):
                'M-down pressed' : [ None, self.OnPageDown ],
                'pageup pressed' : [ None, self.OnPageUp ],
              'pagedown pressed' : [ None, self.OnPageDown ],
-                 'home pressed' : [ None, _F(self.select, 0) ],
-                  'end pressed' : [ None, _F(self.select, -1) ],
+                 'home pressed' : [ None, _F(self.select, index=0) ],
+                  'end pressed' : [ None, _F(self.select, index=-1) ],
                   'M-a pressed' : [ None, _F(self.fit_to_canvas) ],
                   'C-a pressed' : [ None, _F(self.fit_to_axes) ],
                   'C-i pressed' : [ None, _F(self.invert_cmap) ],
@@ -673,9 +673,11 @@ class GraphPlot(MatplotPanel):
                 self.axes.axis(art.get_extent())
         return art
     
-    def select(self, j):
-        if isinstance(j, (str, AxesImagePhantom)):
-            j = self.index(j)
+    def select(self, index):
+        if isinstance(index, (str, AxesImagePhantom)):
+            j = self.index(index)
+        else:
+            j = index
         
         for art in self.__Arts: # Hide all frames
             art.set_visible(0)

mwx/nutshell.py

@@ -478,7 +478,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
                 'pointer_unset' : [ None, dispatch ],
             },
             0 : {
-               'insert pressed' : (0, _F(self.over, None, doc="toggle-over")),
+               'insert pressed' : (0, _F(self.over, mode=None, doc="toggle-over")),
                'C-left pressed' : (0, _F(self.WordLeft)),
               'C-right pressed' : (0, _F(self.WordRightEnd)),
              'C-S-left pressed' : (0, _F(self.selection_backward_word_or_paren)),
@@ -2890,10 +2890,10 @@ class Nautilus(EditorInterface, Shell):
               'S-left released' : (1, self.call_history_comp),
               'S-right pressed' : (1, skip),
              'S-right released' : (1, self.call_history_comp),
-                  'tab pressed' : (1, _F(self._on_completion,  1)), # 古いヒストリへ進む
-                'S-tab pressed' : (1, _F(self._on_completion, -1)), # 新しいヒストリへ戻る
-                  'M-p pressed' : (1, _F(self._on_completion,  1)),
-                  'M-n pressed' : (1, _F(self._on_completion, -1)),
+                  'tab pressed' : (1, _F(self._on_completion, step=1)), # 古いヒストリへ進む
+                'S-tab pressed' : (1, _F(self._on_completion, step=-1)), # 新しいヒストリへ戻る
+                  'M-p pressed' : (1, _F(self._on_completion, step=1)),
+                  'M-n pressed' : (1, _F(self._on_completion, step=-1)),
             '[a-z0-9_] pressed' : (1, skip),
            '[a-z0-9_] released' : (1, self.call_history_comp),
             'S-[a-z\\] pressed' : (1, skip),

{mwxlib-1.4.11.dist-info → mwxlib-1.4.12.dist-info}/METADATA

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

{mwxlib-1.4.11.dist-info → mwxlib-1.4.12.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
-mwx/bookshelf.py,sha256=MXjrm_ryRGHvOFKu8wb10qz_oka70xW2yFbYjBMYfns,8140
+mwx/bookshelf.py,sha256=XbJ9HUH5COUm-BVI7iLC7gr9Hj9l-sFjOoaCAqNS4aA,8178
 mwx/controls.py,sha256=1zLWlPy0RTLHYlvxjz3ulDoTx3-uPUD3TqK7dGRA4wg,49563
-mwx/framework.py,sha256=1p24_snigDnU-9CwjQJdQeEsS44z27IwvC67reS6zX8,76832
-mwx/graphman.py,sha256=4hS3zBH1Ob9CcsWBsnPo5Tw6RTiE0vKjKpcjeZ5RSrU,70049
+mwx/framework.py,sha256=oPLhLLRIoT9fudPsA6c9YzvThQdg4rJmmvShOlGMTSk,76909
+mwx/graphman.py,sha256=DDbmfZz29kVInzZ2NufYISd03ezKGtZdPyFZ5wDgKA0,70064
 mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
 mwx/matplot2.py,sha256=A2PbHI5UcuAvINfnm6GG7CXpbexhzvtyVLQOwcbRqnc,33015
-mwx/matplot2g.py,sha256=HTSh0vd06-HhiwEZbhwFD6HGjfnwGQ7H6QQzTucOx3c,65220
+mwx/matplot2g.py,sha256=hUU1afbM6q7DQe6mU91m38odcnVo8B4e97xPvaQbshI,65282
 mwx/matplot2lg.py,sha256=cb0EZXivccDQu4oFj5ddSUF9pEE4f5UuFJJK2ELItww,27404
 mwx/mgplt.py,sha256=8mXbHpCmm7lz3XbAxOg7IVC7DaSGBEby1UfTlMl9kjk,5604
-mwx/nutshell.py,sha256=aZSXcWMsVF_til2ZCASwGwK1Jqq3qfGFJ6KJjK7TX6A,143091
+mwx/nutshell.py,sha256=J50NGi_6CmCJQZEBZt8QpxAQF97y2-tRf9xw49RAyQc,143114
 mwx/testsuite.py,sha256=Zk75onPSEn2tf0swS3l-vIn6yTXGB7allIyvJsPHj20,1229
 mwx/utilus.py,sha256=ObXYWsDVn5DmjvwVQgP2HGAhrdxlDrwL7g9pMCDbU7U,38127
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
@@ -22,7 +22,7 @@ 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.4.11.dist-info/METADATA,sha256=IZXZTnCIPRB-B1eTwiGW6uD5IYtlmaNzMdgOs89Qpko,7382
-mwxlib-1.4.11.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-mwxlib-1.4.11.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.4.11.dist-info/RECORD,,
+mwxlib-1.4.12.dist-info/METADATA,sha256=y041f7Y-CwmHeEzr7zHuXr7Wxu3zUQhVOYBcPd9dIbE,7382
+mwxlib-1.4.12.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+mwxlib-1.4.12.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.4.12.dist-info/RECORD,,