mwxlib 0.93.9__py3-none-any.whl → 0.94.2__py3-none-any.whl

mwx/__init__.py

@@ -4,7 +4,7 @@
 from .framework import __version__, __author__
 from .framework import FSM
 from .framework import Menu, MenuBar, StatusBar
-from .framework import App, Frame, MiniFrame, ShellFrame
+from .framework import deb, App, Frame, MiniFrame, ShellFrame
 
 ## Controls
 ## from . import controls
@@ -25,46 +25,3 @@ from .framework import App, Frame, MiniFrame, ShellFrame
 ## Gnuplot
 ## from .mgplt import Gnuplot
 ## from .mgplt import GnuplotFrame
-
-
-def deb(target=None, loop=True, locals=None, **kwargs):
-    """Dive into the process.
-    
-    Args:
-        target  : Object or module (default None).
-                  If None, the target is set to `__main__`.
-        loop    : If True, the app and the mainloop will be created.
-                  Otherwise, neither the app nor the mainloop will be created.
-        locals  : Additional context of the shell
-        
-        **kwargs: Nautilus arguments
-        
-            - 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).
-    """
-    import wx
-    
-    quote_unqoute = """
-        Anything one man can imagine, other man can make real.
-        --- Jules Verne (1828--1905)
-        """
-    kwargs.setdefault("introText",
-                      "mwx {}".format(__version__) + quote_unqoute)
-    kwargs.setdefault("execStartupScript", True)
-    kwargs.setdefault("ensureClose", True)
-    
-    app = wx.GetApp() or wx.App()
-    frame = ShellFrame(None, target, **kwargs)
-    frame.Show()
-    frame.rootshell.SetFocus()
-    if locals:
-        frame.rootshell.locals.update(locals)
-    if loop and not app.GetMainLoop():
-        app.MainLoop()
-    return frame

mwx/controls.py

@@ -1119,7 +1119,7 @@ class Choice(wx.Control):
     
     Selection = property(
         lambda self: self._ctrl.GetSelection(),
-        lambda self,v: self._ctrl.SetSelection(v),
+        lambda self,v: self._ctrl.SetSelection(v), # int or NOT_FOUND(-1)
         doc="combobox selection:int")
     
     Items = property(
@@ -1199,7 +1199,7 @@ class Indicator(wx.Control):
         self.__value = int(v)
         self.Refresh()
     
-    def udpate_design(self, **kwargs):
+    def update_design(self, **kwargs):
         """Update design attributes.
         
         This method is useful for changing colors, spacing, radius, etc.

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.93.9"
+__version__ = "0.94.2"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -26,6 +26,47 @@ from .utilus import FSM, TreeList, apropos, typename, where, mro, pp
 from .utilus import get_rootpath
 
 
+def deb(target=None, loop=True, locals=None, **kwargs):
+    """Dive into the process.
+    
+    Args:
+        target  : Object or module (default None).
+                  If None, the target is set to `__main__`.
+        loop    : If True, the app and the mainloop will be created.
+                  Otherwise, neither the app nor the mainloop will be created.
+        locals  : Additional context of the shell
+        
+        **kwargs: Nautilus arguments
+        
+            - 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).
+    """
+    import wx
+    
+    quote_unqoute = """
+        Anything one man can imagine, other man can make real.
+        --- Jules Verne (1828--1905)
+        """
+    kwargs.setdefault("introText",
+                      "mwx {}".format(__version__) + quote_unqoute)
+    kwargs.setdefault("execStartupScript", True)
+    kwargs.setdefault("ensureClose", True)
+    
+    with App(loop):
+        frame = ShellFrame(None, target, **kwargs)
+        frame.Show()
+        frame.rootshell.SetFocus()
+        if locals:
+            frame.rootshell.locals.update(locals)
+        return frame
+
+
 @contextmanager
 def App(loop=True):
     app = wx.GetApp() or wx.App()
@@ -975,7 +1016,7 @@ class FileDropLoader(wx.DropTarget):
     def __init__(self, target):
         wx.DropTarget.__init__(self)
         
-        self.editor = target
+        self.book = target
         self.textdo = wx.TextDataObject()
         self.filedo = wx.FileDataObject()
         self.DataObject = wx.DataObjectComposite()
@@ -983,25 +1024,26 @@ class FileDropLoader(wx.DropTarget):
         self.DataObject.Add(self.filedo, True)
     
     def OnData(self, x, y, result):
+        editor = self.book
         self.GetData()
         if self.textdo.TextLength > 1:
             f = self.textdo.Text.strip()
-            res = self.editor.load_file(f)
+            res = editor.load_file(f)
             if res:
-                self.editor.buffer.SetFocus()
+                editor.buffer.SetFocus()
                 result = wx.DragCopy
             elif res is None:
-                self.editor.post_message("Load canceled.")
+                editor.post_message("Load canceled.")
                 result = wx.DragCancel
             else:
-                self.editor.post_message(f"Loading {f!r} failed.")
+                editor.post_message(f"Loading {f!r} failed.")
                 result = wx.DragNone
             self.textdo.Text = ''
         else:
             for f in self.filedo.Filenames:
-                if self.editor.load_file(f):
-                    self.editor.buffer.SetFocus()
-                    self.editor.post_message(f"Loaded {f!r} successfully.")
+                if editor.load_file(f):
+                    editor.buffer.SetFocus()
+                    editor.post_message(f"Loaded {f!r} successfully.")
             self.filedo.SetData(wx.DF_FILENAME, None)
         return result
 
@@ -1236,9 +1278,9 @@ class ShellFrame(MiniFrame):
             shell = self.current_shell
             self.Scratch.buffer.py_eval_line(shell.globals, shell.locals)
         
-        @self.Scratch.define_key('M-j')
+        @self.Scratch.define_key('C-S-j')
         @postcall
-        def exec_buffer():
+        def eval_buffer():
             shell = self.current_shell
             self.Scratch.buffer.py_exec_region(shell.globals, shell.locals)
         
@@ -1487,26 +1529,26 @@ class ShellFrame(MiniFrame):
             evt.Skip()
     
     def About(self, evt=None):
-        buf = self.Help.buffer
-        with buf.off_readonly():
-            buf.SetText('\n\n'.join((
+        self.add_help(
+            '\n\n'.join((
                 "#<module 'mwx' from {!r}>".format(__file__),
                 "Author: {!r}".format(__author__),
                 "Version: {!s}".format(__version__),
                 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),
                 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",
                 ))
             )
-        self.popup_window(self.Help, focus=0)
     
     def toggle_window(self, win, focus=False):
         self.popup_window(win, show=None, focus=focus)

mwx/graphman.py

@@ -713,12 +713,12 @@ class Frame(mwx.Frame):
             ("Options", []), # reserved for optional app settings
             (),
             (mwx.ID_(13), "&Graph window\tF9", "Show graph window", wx.ITEM_CHECK,
-                lambda v: self.show_pane("graph", v.IsChecked()),
-                lambda v: v.Check(self.graph.IsShown())),
+                lambda v: self.show_pane(self.graph, v.IsChecked()),
+                lambda v: v.Check(self.graph.IsShownOnScreen())),
                 
             (mwx.ID_(14), "&Output window\tF10", "Show Output window", wx.ITEM_CHECK,
-                lambda v: self.show_pane("output", v.IsChecked()),
-                lambda v: v.Check(self.output.IsShown())),
+                lambda v: self.show_pane(self.output, v.IsChecked()),
+                lambda v: v.Check(self.output.IsShownOnScreen())),
             (),
         ]
         self.menubar["Edit"] = [
@@ -743,8 +743,8 @@ class Frame(mwx.Frame):
                 lambda v: self.__view.hide_layers()),
             (),
             (mwx.ID_(24), "&Histogram\tCtrl-h", "Show Histogram window", wx.ITEM_CHECK,
-                lambda v: self.show_pane("histogram", v.IsChecked()),
-                lambda v: v.Check(self.histogram.IsShown())),
+                lambda v: self.show_pane(self.histogram, v.IsChecked()),
+                lambda v: v.Check(self.histogram.IsShownOnScreen())),
                 
             (mwx.ID_(25), "&Invert Color\t(C-i)", "Invert colormap", wx.ITEM_CHECK,
                 lambda v: self.__view.invert_cmap(),
@@ -783,14 +783,14 @@ class Frame(mwx.Frame):
         ]
         self.menubar.reset()
         
-        def show_graph(frame):
+        def show_frameview(frame):
             wx.CallAfter(self.show_pane, frame.parent) # Show graph / output
         
         self.graph.handler.append({ # DNA<Graph:Frame>
             None : {
                   'frame_shown' : [ None, self.set_title ],
-                 'frame_loaded' : [ None, show_graph ],
-               'frame_modified' : [ None, show_graph ],
+                 'frame_loaded' : [ None, show_frameview ],
+               'frame_modified' : [ None, show_frameview ],
                'frame_selected' : [ None, self.set_title ],
                   'canvas_draw' : [ None, lambda v: self.sync(self.graph, self.output) ],
             },
@@ -798,8 +798,8 @@ class Frame(mwx.Frame):
         self.output.handler.append({ # DNA<Graph:Frame>
             None : {
                   'frame_shown' : [ None, self.set_title ],
-                 'frame_loaded' : [ None, show_graph ],
-               'frame_modified' : [ None, show_graph ],
+                 'frame_loaded' : [ None, show_frameview ],
+               'frame_modified' : [ None, show_frameview ],
                'frame_selected' : [ None, self.set_title ],
                   'canvas_draw' : [ None, lambda v: self.sync(self.output, self.graph) ],
             },
@@ -1802,16 +1802,12 @@ class Frame(mwx.Frame):
                 o.write("self.load_plug({!r}, session={})\n".format(path, session or None))
             o.write("self._mgr.LoadPerspective({!r})\n".format(self._mgr.SavePerspective()))
             
-            ## set-global-unit
-            o.write("self.graph.unit = {:g}\n".format(self.graph.unit))
-            o.write("self.output.unit = {:g}\n".format(self.output.unit))
-            
             ## stack-frame
             paths = [x.pathname for x in self.graph.all_frames if x.pathname]
             if paths:
                 o.write("self.load_frame(\n{}, self.graph)\n".format(
                         pformat(paths, width=160)))
-            if len(paths) > 1:
+                
                 frame = self.graph.frame # restore currently selected frame
                 if frame and frame.pathname:
                     o.write("self.graph.select({!r})\n".format(frame.name))

mwx/nutshell.py

@@ -2220,8 +2220,8 @@ class Nautilus(Shell, EditorInterface):
     
         C-up        : [0] retrieve previous history
         C-down      : [0] retrieve next history
-        C-j, M-j    : [0] call tooltip of eval (for the word selected or focused)
-        C-h, M-h    : [0] call tooltip of help (for the func selected or focused)
+        C-j, C-S-j  : [0] call tooltip of eval (for the word selected or focused)
+        C-h, C-S-h  : [0] call tooltip of help (for the func selected or focused)
         TAB         : [1] history-comp-mode
         M-p         : [1] retrieve previous history in comp-mode
         M-n         : [1] retrieve next history in comp-mode
@@ -2472,9 +2472,9 @@ class Nautilus(Shell, EditorInterface):
              '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-S-j pressed' : (0, self.exec_region),
                   'C-h pressed' : (0, self.call_helpTip),
-                  'M-h pressed' : (0, self.call_helpTip2),
+                'C-S-h pressed' : (0, self.call_helpTip2),
                     '. pressed' : (2, self.OnEnterDot),
                   'tab pressed' : (1, self.call_history_comp),
                   'M-p pressed' : (1, self.call_history_comp),
@@ -2531,9 +2531,9 @@ class Nautilus(Shell, EditorInterface):
           '*backspace released' : (2, self.call_word_autocomp),
         'C-S-backspace pressed' : (2, ),
                   'C-j pressed' : (2, self.eval_line),
-                  'M-j pressed' : (2, self.exec_region),
+                'C-S-j pressed' : (2, self.exec_region),
                   'C-h pressed' : (2, self.call_helpTip),
-                  'M-h pressed' : (2, self.call_helpTip2),
+                'C-S-h pressed' : (2, self.call_helpTip2),
                  '*alt pressed' : (2, ),
                 '*ctrl pressed' : (2, ),
                '*shift pressed' : (2, ),
@@ -2562,9 +2562,9 @@ class Nautilus(Shell, EditorInterface):
           '*backspace released' : (3, self.call_apropos_autocomp),
         'C-S-backspace pressed' : (3, ),
                   'C-j pressed' : (3, self.eval_line),
-                  'M-j pressed' : (3, self.exec_region),
+                'C-S-j pressed' : (3, self.exec_region),
                   'C-h pressed' : (3, self.call_helpTip),
-                  'M-h pressed' : (3, self.call_helpTip2),
+                'C-S-h pressed' : (3, self.call_helpTip2),
                  '*alt pressed' : (3, ),
                 '*ctrl pressed' : (3, ),
                '*shift pressed' : (3, ),
@@ -2593,9 +2593,9 @@ class Nautilus(Shell, EditorInterface):
           '*backspace released' : (4, self.call_text_autocomp),
         'C-S-backspace pressed' : (4, ),
                   'C-j pressed' : (4, self.eval_line),
-                  'M-j pressed' : (4, self.exec_region),
+                'C-S-j pressed' : (4, self.exec_region),
                   'C-h pressed' : (4, self.call_helpTip),
-                  'M-h pressed' : (4, self.call_helpTip2),
+                'C-S-h pressed' : (4, self.call_helpTip2),
                  '*alt pressed' : (4, ),
                 '*ctrl pressed' : (4, ),
                '*shift pressed' : (4, ),
@@ -2730,7 +2730,7 @@ class Nautilus(Shell, EditorInterface):
         rst = self.get_style(p)
         if p == self.bolc:
             self.ReplaceSelection('self') # replace [.] --> [self.]
-        elif st in ('nil', 'op', 'sep', 'lparen'):
+        elif st in ('nil', 'space', 'op', 'sep', 'lparen'):
             self.ReplaceSelection('self')
         elif st not in ('moji', 'word', 'rparen') or rst == 'word':
             self.handler('quit', evt) # don't enter autocomp
@@ -3307,13 +3307,12 @@ class Nautilus(Shell, EditorInterface):
         
         text = self.SelectedText or self.Command or self.expr_at_caret
         if text:
+            text = introspect.getRoot(text, terminator='(')
             try:
-                text = introspect.getRoot(text, terminator='(')
                 obj = self.eval(text)
+                self.help(obj)
             except Exception as e:
                 self.message("- {} : {!r}".format(e, text))
-            else:
-                self.help(obj)
     
     def call_helpTip(self, evt):
         """Show tooltips for the selected topic."""

mwx/utilus.py

@@ -3,6 +3,7 @@
 """
 from functools import wraps
 from bdb import BdbQuit
+from contextlib import contextmanager
 import traceback
 import warnings
 import time
@@ -20,6 +21,20 @@ from inspect import (isclass, ismodule, ismethod, isbuiltin,
 from pprint import pprint
 
 
+@contextmanager
+def ignore(*category):
+    """Ignore warnings.
+    
+    It can be used as decorators as well as in with statements.
+    cf. contextlib.suppress
+    
+    Note:
+        ignore() does not ignore warnings.
+        ignore(Warning) ignores all warnings.
+    """
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", category)
+        yield
 def atom(v):
     return not hasattr(v, '__name__')
 
@@ -126,9 +141,7 @@ def apropos(obj, rexpr='', ignorecase=True, alias=None, pred=None, locals=None):
         except (TypeError, ValueError):
             pass
     
-    with warnings.catch_warnings():
-        warnings.simplefilter('ignore', DeprecationWarning)
-        
+    with ignore(DeprecationWarning):
         print("matching to {!r} in {} {} :{}".format(
               rexpr, name, type(obj), pred and pred.__name__))
         try:

{mwxlib-0.93.9.dist-info → mwxlib-0.94.2.dist-info}/METADATA

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

{mwxlib-0.93.9.dist-info → mwxlib-0.94.2.dist-info}/RECORD

@@ -1,15 +1,15 @@
-mwx/__init__.py,sha256=5B4YSOuijG1Uo5-FLtLHGB52Cp_F4vnN--4wGPBx7do,2398
+mwx/__init__.py,sha256=zLsXDgqyC5NsPCjRxjS2huvZ3uDyeOJ1vapotqe2ULM,834
 mwx/bookshelf.py,sha256=FrissUYdGXLABOzJmMaQU6GXvu6n_9DVW3d5wGwQzjM,6613
-mwx/controls.py,sha256=9C1sXBwQl-oZtCb3rXoT-doW48Sv1J359toNq9ScF9M,47173
-mwx/framework.py,sha256=Q_QSjaa3EwydXi_ON56rvhxWF79M3e_uvgIFq2jw7Ho,73951
-mwx/graphman.py,sha256=SKYJFxi-TqWOALRczYz-M-2ZYEbqiZuAuKCfEIedctY,70156
+mwx/controls.py,sha256=1eguX5eofsA6hmS2y7R4hvlFjFikVoZ8v2S1ES7rjEU,47196
+mwx/framework.py,sha256=1QVxdGh9q2auq4hQV-DaJsAZellHuUd9jpYfPBUj0fA,75394
+mwx/graphman.py,sha256=UsNBo5Z1eiuXj3VkxCZds_Uy8R0cQV7mXoCwLtejbCE,70001
 mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
 mwx/matplot2.py,sha256=qaF_gvLoLn-TimLbRR59KUavNr1ZpZQdSMqjzJk47rk,32682
 mwx/matplot2g.py,sha256=Ca-3RJZmSiZcvNrXmeK_lFf2fdG-0gkp7dYkCtrKi2I,65530
 mwx/matplot2lg.py,sha256=tg8u7w4DxiJdPN-E197NOmbQpc_1gZkgDHYv_xUhbFA,27224
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=5HErOObnOprMc6gYnXV7wY-ALnlwNpmhV8f0EyipYA4,135816
-mwx/utilus.py,sha256=THDxQ-QqbHYVc8iX8qN9yxvfcf7Pvpm7sfTP9ipYvzs,37040
+mwx/nutshell.py,sha256=iJEFzcu5qfp-HxXORB8ci-Q1z7a8zTPwbfFxik5h6pY,135802
+mwx/utilus.py,sha256=5GVSNKyvNWxsDftIrTJUhBlnQAh3zvrW5BuQSGasJv8,37395
 mwx/wxmon.py,sha256=Qk86VbuuW2rR46pqEYLur13G_aloWz5SVv6sib30YY0,12717
 mwx/wxpdb.py,sha256=2z3ZD9Oo1H-ONBHlaprkB9hrTmAI7o03sqO46ppEFE4,19129
 mwx/wxwil.py,sha256=JK1du4i1RVMbDLqN8jLRDSu_JhKEp4mhHVMElzo4yoE,5578
@@ -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.93.9.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.93.9.dist-info/METADATA,sha256=nAajTF4HxuXA8Mee0naQz9t8mxUyduim3U5C0Dwjo7E,1925
-mwxlib-0.93.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.93.9.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.93.9.dist-info/RECORD,,
+mwxlib-0.94.2.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.94.2.dist-info/METADATA,sha256=nG8tQUyP23iDpjnaedgv9mFikcFoIBpFhFhfgI0wlWY,1925
+mwxlib-0.94.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mwxlib-0.94.2.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.94.2.dist-info/RECORD,,