mwxlib 0.99.2__py3-none-any.whl → 0.99.3__py3-none-any.whl

mwx/controls.py

@@ -7,7 +7,7 @@ import wx.lib.platebtn as pb
 import wx.lib.scrolledpanel as scrolled
 
 from . import images
-from .utilus import SSM, warn
+from .utilus import SSM
 from .utilus import funcall as _F
 from .framework import pack, Menu, CtrlInterface
 
@@ -85,14 +85,6 @@ class Param:
     def __len__(self):
         return len(self.range)
     
-    def bind(self, action=None, target='control'):
-        warn("Use `Param.callback.bind('control')` instead.", DeprecationWarning)
-        return self.callback.bind(target, action)
-    
-    def unbind(self, action=None, target='control'):
-        warn("Use `Param.callback.unbind('control')` instead.", DeprecationWarning)
-        return self.callback.unbind(target, action)
-    
     def reset(self, v=None, internal_callback=True):
         """Reset value when indexed (by knobs) with callback."""
         if v is None:

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.99.2"
+__version__ = "0.99.3"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -1276,7 +1276,8 @@ class ShellFrame(MiniFrame):
             },
         })
         
-        self.Scratch.set_attributes(Style=Nautilus.STYLE)
+        self.Scratch.set_attributes(Style=self.rootshell.get_stylus())
+        
         self.Log.set_attributes(ReadOnly=True)
         self.Help.set_attributes(ReadOnly=False)
         
@@ -1603,13 +1604,6 @@ class ShellFrame(MiniFrame):
         self.indicator.Value = 1
         self.message("Quit")
     
-    def _load(self, filename, lineno, editor): # for backward compatibility
-        """Load file in the session (internal use only)."""
-        if isinstance(editor, str):
-            editor = getattr(self, editor, None)
-        if editor:
-            return editor.load_file(filename, lineno)
-    
     @save_focus_excursion()
     def load(self, filename, lineno=0, show=True):
         """Load file @where the object is defined.

mwx/graphman.py

@@ -4,9 +4,9 @@
 from functools import wraps
 from importlib import reload, import_module
 from contextlib import contextmanager
-from pprint import pformat
 from bdb import BdbQuit
-import subprocess
+from pprint import pformat
+from subprocess import Popen
 import threading
 import traceback
 import inspect
@@ -1335,11 +1335,9 @@ class Frame(mwx.Frame):
         plug = self.get_plug(name)
         if not plug:
             return
-        ## this = inspect.getmodule(plug)
-        this = self.plugins[plug.__module__]
-        cmd = '{} "{}"'.format(self.Editor, this.__file__)
-        subprocess.Popen(cmd)
-        self.message(cmd)
+        
+        Popen([self.Editor,
+               inspect.getmodule(plug).__file__])
     
     def inspect_plug(self, name):
         """Dive into the process to inspect plugs in the shell.

mwx/nutshell.py

@@ -47,6 +47,90 @@ py_frame_re = r" +file '(.*?)', line ([0-9]+)"
 py_where_re = r'> +([^*?"<>|\r\n]+?):([0-9]+)'
 py_break_re = r'at ([^*?"<>|\r\n]+?):([0-9]+)'
 
+## Custom constants in wx.stc
+stc.STC_P_WORD3 = 20 # deprecated
+stc.STC_STYLE_CARETLINE = 40
+stc.STC_STYLE_ANNOTATION = 41
+
+class Stylus:
+    py_buffer_mode = {
+        stc.STC_STYLE_DEFAULT     : "fore:#7f7f7f,back:#ffffb8,size:9,face:MS Gothic",
+        stc.STC_STYLE_LINENUMBER  : "fore:#000000,back:#ffffb8,size:9",
+        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_CARETLINE   : "fore:#000000,back:#ffff7f,size:2", # optional
+        stc.STC_STYLE_ANNOTATION  : "fore:#7f0000,back:#ff7f7f", # optional
+        stc.STC_P_DEFAULT         : "fore:#000000",
+        stc.STC_P_OPERATOR        : "fore:#000000",
+        stc.STC_P_IDENTIFIER      : "fore:#000000",
+        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_CLASSNAME       : "fore:#7f00ff,bold",
+        stc.STC_P_DEFNAME         : "fore:#0000ff,bold",
+        stc.STC_P_WORD            : "fore:#0000ff",
+        stc.STC_P_WORD2           : "fore:#b8007f",
+        stc.STC_P_DECORATOR       : "fore:#e08040",
+    }
+
+    py_text_mode = {
+        stc.STC_STYLE_DEFAULT     : "fore:#7f7f7f,back:#fffff8,size:9,face:MS Gothic",
+        stc.STC_STYLE_LINENUMBER  : "fore:#000000,back:#fffff8,size:9",
+        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_CARETLINE   : "fore:#000000,back:#f0f0ff,size:2", # optional
+        stc.STC_STYLE_ANNOTATION  : "fore:#7f0000,back:#ff7f7f", # optional
+        stc.STC_P_DEFAULT         : "fore:#000000",
+        stc.STC_P_OPERATOR        : "fore:#000000",
+        stc.STC_P_IDENTIFIER      : "fore:#000000",
+        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_CLASSNAME       : "fore:#7f00ff,bold",
+        stc.STC_P_DEFNAME         : "fore:#0000ff,bold",
+        stc.STC_P_WORD            : "fore:#0000ff",
+        stc.STC_P_WORD2           : "fore:#7f007f",
+        stc.STC_P_DECORATOR       : "fore:#c04040,bold",
+    }
+
+    py_shell_mode = {
+        stc.STC_STYLE_DEFAULT     : "fore:#7f7f7f,back:#202020,size:9,face:MS Gothic",
+        stc.STC_STYLE_LINENUMBER  : "fore:#000000,back:#f0f0f0,size:9",
+        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_CARETLINE   : "fore:#ffffff,back:#123460,size:2", # optional
+        stc.STC_STYLE_ANNOTATION  : "fore:#7f0000,back:#ff7f7f", # optional
+        stc.STC_P_DEFAULT         : "fore:#cccccc",
+        stc.STC_P_OPERATOR        : "fore:#cccccc",
+        stc.STC_P_IDENTIFIER      : "fore:#cccccc",
+        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_CLASSNAME       : "fore:#61d6d6,bold",
+        stc.STC_P_DEFNAME         : "fore:#3a96ff,bold",
+        stc.STC_P_WORD            : "fore:#80c0ff",
+        stc.STC_P_WORD2           : "fore:#ff80ff",
+        stc.STC_P_DECORATOR       : "fore:#ff8040",
+    }
+
 
 def skip(evt):
     evt.Skip()
@@ -520,12 +604,8 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         
         self.SetProperty('fold', '1') # Enable folder property
         
-        ## if wx.VERSION >= (4,1,0):
-        try:
-            self.Bind(stc.EVT_STC_MARGINCLICK, self.OnMarginClick)
-            self.Bind(stc.EVT_STC_MARGIN_RIGHT_CLICK, self.OnMarginRClick)
-        except AttributeError:
-            pass
+        self.Bind(stc.EVT_STC_MARGINCLICK, self.OnMarginClick)
+        self.Bind(stc.EVT_STC_MARGIN_RIGHT_CLICK, self.OnMarginRClick)
         
         ## Custom markers
         self.MarkerDefine(0, stc.STC_MARK_CIRCLE, '#007ff0', '#007ff0') # o mark
@@ -585,11 +665,6 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.__mark = -1
         self.__stylus = {}
     
-    ## Custom constants embedded in wx.stc
-    stc.STC_P_WORD3 = 20 # deprecated
-    stc.STC_STYLE_CARETLINE = 40
-    stc.STC_STYLE_ANNOTATION = 41
-    
     def OnDrag(self, evt): #<wx._core.StyledTextEvent>
         EditorInterface.__dnd_from = evt.EventObject
         try:
@@ -1079,6 +1154,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         return self.__stylus
     
     def set_stylus(self, spec=None, **kwargs):
+        """Set style spec for wx.stc.StyleSetSpec."""
         spec = spec and spec.copy() or {}
         spec.update(kwargs)
         if not spec:
@@ -1630,32 +1706,6 @@ class Buffer(EditorInterface, EditWindow):
         filename : buffer-file-name
         code     : code object
     """
-    STYLE = {
-        stc.STC_STYLE_DEFAULT     : "fore:#7f7f7f,back:#ffffb8,size:9,face:MS Gothic",
-        stc.STC_STYLE_LINENUMBER  : "fore:#000000,back:#ffffb8,size:9",
-        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_CARETLINE   : "fore:#000000,back:#ffff7f,size:2", # optional
-        stc.STC_STYLE_ANNOTATION  : "fore:#7f0000,back:#ff7f7f", # optional
-        stc.STC_P_DEFAULT         : "fore:#000000",
-        stc.STC_P_OPERATOR        : "fore:#000000",
-        stc.STC_P_IDENTIFIER      : "fore:#000000",
-        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_CLASSNAME       : "fore:#7f00ff,bold",
-        stc.STC_P_DEFNAME         : "fore:#0000ff,bold",
-        stc.STC_P_WORD            : "fore:#0000ff",
-        stc.STC_P_WORD2           : "fore:#b8007f",
-        stc.STC_P_DECORATOR       : "fore:#e08040",
-    }
-    
     @property
     def message(self):
         return self.parent.message
@@ -1880,7 +1930,7 @@ class Buffer(EditorInterface, EditWindow):
         })
         
         self.show_folder()
-        self.set_stylus(self.STYLE)
+        self.set_stylus(Stylus.py_buffer_mode)
     
     def __contains__(self, code):
         if inspect.iscode(code) and self.code:
@@ -2208,7 +2258,6 @@ class EditorBook(AuiNotebook, CtrlInterface):
             buf : a buffer to apply (if None, applies to all buffers).
             **kwargs: default style.
             
-                Style           = Buffer.STYLE
                 ReadOnly        = False
                 UseTabs         = False
                 ViewEOL         = False
@@ -2645,32 +2694,6 @@ class Nautilus(EditorInterface, Shell):
         Half-baked by Patrik K. O'Brien,
         and this other half by K. O'moto.
     """
-    STYLE = {
-        stc.STC_STYLE_DEFAULT     : "fore:#7f7f7f,back:#202020,size:9,face:MS Gothic",
-        stc.STC_STYLE_LINENUMBER  : "fore:#000000,back:#f0f0f0,size:9",
-        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_CARETLINE   : "fore:#ffffff,back:#123460,size:2", # optional
-        stc.STC_STYLE_ANNOTATION  : "fore:#7f0000,back:#ff7f7f", # optional
-        stc.STC_P_DEFAULT         : "fore:#cccccc",
-        stc.STC_P_OPERATOR        : "fore:#cccccc",
-        stc.STC_P_IDENTIFIER      : "fore:#cccccc",
-        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_CLASSNAME       : "fore:#61d6d6,bold",
-        stc.STC_P_DEFNAME         : "fore:#3a96ff,bold",
-        stc.STC_P_WORD            : "fore:#80c0ff",
-        stc.STC_P_WORD2           : "fore:#ff80ff",
-        stc.STC_P_DECORATOR       : "fore:#ff8040",
-    }
-    
     @property
     def message(self):
         return self.parent.message
@@ -2990,7 +3013,7 @@ class Nautilus(EditorInterface, Shell):
         
         self.wrap(0)
         self.show_folder()
-        self.set_stylus(self.STYLE)
+        self.set_stylus(Stylus.py_shell_mode)
         
         ## delete unnecessary arrows at startup
         del self.white_arrow

{mwxlib-0.99.2.dist-info → mwxlib-0.99.3.dist-info}/METADATA

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

{mwxlib-0.99.2.dist-info → mwxlib-0.99.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
 mwx/bookshelf.py,sha256=so-xSLq08sMlJBErTxOaDoKUAMa_g1CkIP2pNnff68c,5607
-mwx/controls.py,sha256=1WTJEFeeGY9_gycGzHMQUdgBGgwc2QnvDnQPJ49bRZY,48053
-mwx/framework.py,sha256=dCQ_xwPssrjBpGYLwxQRlKRHf-kX4tumFgZlVt7iQ3Q,75587
-mwx/graphman.py,sha256=-klqkJ8h5Vi01Xe9H_N28m-59x2lbRe_ow3NHswnDZE,70433
+mwx/controls.py,sha256=0UkLeyIsQU0uj--v1NYctx-GzqO36Z5rdeNpCsfIN10,47657
+mwx/framework.py,sha256=YG3NHz8Jc0llVmlU22W9KOALESPJnjTc0zL5PQmwbQA,75304
+mwx/graphman.py,sha256=s0qlaDIPFFvJaY7MeFNcEg4kxbF27jsyu-dJFgulo_U,70327
 mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
 mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
 mwx/matplot2g.py,sha256=gCXa8X1MEMP7n_mG73h3SkWKuNZOfjVKUTWNRXXK11c,64310
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=0WJ1RN_Y0a4Y3rz1C_Lx-WhumtOMdb1N49guX9aZZ_o,5602
-mwx/nutshell.py,sha256=xoHTyWZ46geGy3u4aU8k8_-mr520EdGcvuQRO4TBU_A,140715
+mwx/nutshell.py,sha256=1lHjyrCY4J_wtRlMnJuLq6xn22ofWw6TrZPtGthXZyc,142080
 mwx/utilus.py,sha256=iizdVrbwL1lX7eTfsMmltFz4IfHqTXVM37wwlPQ3A3Y,37346
 mwx/wxmon.py,sha256=Pq8XXigM_isJd80yiqG18iRVdArJpsePpxfnZOkk-Uw,12573
 mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=yEYPCdLHLSMTJwTv6iYAh3Lo4lJvYfp5BxTLP3FhW9Y
 mwx/plugins/line_profile.py,sha256=--9NIc3x5EfRB3L59JvD7rzENQHyiYfu7wWJo6AuMkA,820
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-0.99.2.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.99.2.dist-info/METADATA,sha256=fLuVjSWTwHhXJmBuIEwD-HCdHHhFPVHnXapKkretuvQ,7411
-mwxlib-0.99.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-mwxlib-0.99.2.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.99.2.dist-info/RECORD,,
+mwxlib-0.99.3.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.99.3.dist-info/METADATA,sha256=W98i-ZcPeMT7ctVJ055GvGZ_wKDf7LG0dWC9l_Wu13c,7411
+mwxlib-0.99.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+mwxlib-0.99.3.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.99.3.dist-info/RECORD,,