mwxlib 1.4.20__py3-none-any.whl → 1.5.9__py3-none-any.whl

mwx/nutshell.py

@@ -27,7 +27,7 @@ from wx.py.shell import Shell
 from wx.py.editwindow import EditWindow
 
 from .utilus import funcall as _F
-from .utilus import ignore, typename
+from .utilus import typename
 from .utilus import split_words, split_parts, split_tokens, find_modules
 from .framework import CtrlInterface, AuiNotebook, Menu
 
@@ -54,6 +54,7 @@ py_break_re = r'at ([^*?"<>|\r\n]+?):([0-9]+)'
 stc.STC_STYLE_CARETLINE = 40
 stc.STC_STYLE_ANNOTATION = 41
 
+
 class Stylus:
     py_log_mode = {
         stc.STC_STYLE_DEFAULT     : "fore:#7f7f7f,back:#ffffb8,size:9,face:MS Gothic",
@@ -338,7 +339,7 @@ class AutoCompInterfaceMixin:
         ## ls = [x for x in self.fragmwords if x.startswith(hint)] # case-sensitive match
         q = hint.lower()
         ls = [x for x in self.fragmwords if x.lower().startswith(q)] # case-insensitive match
-        words = sorted(ls, key=lambda s:s.upper())
+        words = sorted(ls, key=lambda s: s.upper())
         
         self._gen_autocomp(0, hint, words)
         self.message("[text] {} candidates matched"
@@ -396,7 +397,7 @@ class AutoCompInterfaceMixin:
             
             P = re.compile(hint)
             p = re.compile(hint, re.I)
-            words = sorted([x for x in modules if p.match(x)], key=lambda s:s.upper())
+            words = sorted([x for x in modules if p.match(x)], key=lambda s: s.upper())
             
             j = next((k for k, w in enumerate(words) if P.match(w)),
                 next((k for k, w in enumerate(words) if p.match(w)), -1))
@@ -428,7 +429,7 @@ class AutoCompInterfaceMixin:
             obj = self.eval(text)
             P = re.compile(hint)
             p = re.compile(hint, re.I)
-            words = sorted([x for x in dir(obj) if p.match(x)], key=lambda s:s.upper())
+            words = sorted([x for x in dir(obj) if p.match(x)], key=lambda s: s.upper())
             
             j = next((k for k, w in enumerate(words) if P.match(w)),
                 next((k for k, w in enumerate(words) if p.match(w)), -1))
@@ -460,7 +461,7 @@ class AutoCompInterfaceMixin:
             obj = self.eval(text)
             P = re.compile(hint)
             p = re.compile(hint, re.I)
-            words = sorted([x for x in dir(obj) if p.search(x)], key=lambda s:s.upper())
+            words = sorted([x for x in dir(obj) if p.search(x)], key=lambda s: s.upper())
             
             j = next((k for k, w in enumerate(words) if P.match(w)),
                 next((k for k, w in enumerate(words) if p.match(w)), -1))
@@ -513,15 +514,15 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
                   'C-e pressed' : (0, _F(self.end_of_line)),
                   'M-a pressed' : (0, _F(self.back_to_indentation)),
                   'M-e pressed' : (0, _F(self.end_of_line)),
-                  'M-g pressed' : (0, ask(self.goto_line, "Line to goto:", lambda x:int(x)-1),
+                  'M-g pressed' : (0, ask(self.goto_line, "Line to goto:", lambda x: int(x)-1),
                                        _F(self.recenter)),
                   'M-f pressed' : (10, _F(self.filter_text), self.on_itext_enter),
                   'C-k pressed' : (0, _F(self.kill_line)),
                 'C-S-c pressed' : (0, _F(self.Copy)),
                 'C-S-v pressed' : (0, _F(self.Paste)),
                   'C-l pressed' : (0, _F(self.recenter)),
-                'C-S-l pressed' : (0, _F(self.recenter)), # overrides delete-line
-                'C-S-f pressed' : (0, _F(self.set_mark)), # overrides mark
+                ## 'C-S-l pressed' : (0, _F(self.recenter)), # overrides delete-line
+                ## 'C-S-f pressed' : (0, _F(self.set_mark)), # overrides mark
               'C-space pressed' : (0, _F(self.set_mark)),
             'C-S-space pressed' : (0, _F(self.set_pointer)),
           'C-backspace pressed' : (0, _F(self.backward_kill_word)),
@@ -778,23 +779,23 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     
     white_arrow = property(
         lambda self: self.get_marker(1),
-        lambda self,v: self.set_marker(v, 1), # [arrow_set]
-        lambda self: self.del_marker(1))      # [arrow_unset]
+        lambda self, v: self.set_marker(v, 1),  # [arrow_set]
+        lambda self: self.del_marker(1))        # [arrow_unset]
     
     red_arrow = property(
         lambda self: self.get_marker(2),
-        lambda self,v: self.set_marker(v, 2), # [red-arrow_set]
-        lambda self: self.del_marker(2))      # [red-arrow_unset]
+        lambda self, v: self.set_marker(v, 2),  # [red-arrow_set]
+        lambda self: self.del_marker(2))        # [red-arrow_unset]
     
     pointer = property(
         lambda self: self.get_marker(3),
-        lambda self,v: self.set_marker(v, 3), # [pointer_set]
-        lambda self: self.del_marker(3))      # [pointer_unset]
+        lambda self, v: self.set_marker(v, 3),  # [pointer_set]
+        lambda self: self.del_marker(3))        # [pointer_unset]
     
     red_pointer = property(
         lambda self: self.get_marker(4),
-        lambda self,v: self.set_marker(v, 4), # [red-pointer_set]
-        lambda self: self.del_marker(4))      # [red-pointer_unset]
+        lambda self, v: self.set_marker(v, 4),  # [red-pointer_set]
+        lambda self: self.del_marker(4))        # [red-pointer_unset]
     
     @property
     def markline(self):
@@ -908,15 +909,15 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     
     anchor = property(
         lambda self: self.GetAnchor(),
-        lambda self,v: self.SetAnchor(v))
+        lambda self, v: self.SetAnchor(v))
     
     cpos = property(
         lambda self: self.GetCurrentPos(),
-        lambda self,v: self.SetCurrentPos(v))
+        lambda self, v: self.SetCurrentPos(v))
     
     cline = property(
         lambda self: self.GetCurrentLine(),
-        lambda self,v: self.SetCurrentPos(self.PositionFromLine(v)))
+        lambda self, v: self.SetCurrentPos(self.PositionFromLine(v)))
     
     @property
     def bol(self):
@@ -972,12 +973,12 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
             return topic
         with self.save_excursion():
             p = q = self.cpos
-            ## if self.get_char(p-1).isidentifier():
-            if self.GetTextRange(self.PositionBefore(p), p).isidentifier():
+            cp = self.GetTextRange(self.PositionBefore(p), p)  # cf. self.get_char(p-1)
+            if cp.isidentifier() or cp.isalnum():
                 self.WordLeft()
                 p = self.cpos
-            ## if self.get_char(q).isidentifier():
-            if self.GetTextRange(q, self.PositionAfter(q)).isidentifier():
+            cq = self.GetTextRange(q, self.PositionAfter(q))  # cf. self.get_char(q)
+            if cq.isidentifier() or cq.isalnum():
                 self.WordRightEnd()
                 q = self.cpos
             return self.GetTextRange(p, q)
@@ -1322,22 +1323,26 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         if not hl + offset < vl < hl + n - 1 - offset:
             self.ScrollToLine(vl - n//2)
     
-    def DoFindNext(self, findData, findDlg=None):
+    ## --------------------------------
+    ## Search functions
+    ## --------------------------------
+    
+    def DoFindNext(self, findData):
         """Find the search text defined in `findData`.
         
         If found, selects the matched text and scrolls to its line.
         Typically called from `wx.EVT_FIND` event handlers.
         
-        (override) Enables the whole word search.
-                   Returns True if a match is found, False otherwise.
+        (override) Enables whole word search.
+                   Returns the match position if found, -1 otherwise.
         """
         flags = 0
-        if findData.Flags & wx.FR_MATCHCASE: flags |= wx.stc.STC_FIND_MATCHCASE
-        if findData.Flags & wx.FR_WHOLEWORD: flags |= wx.stc.STC_FIND_WHOLEWORD
+        if findData.Flags & wx.FR_MATCHCASE: flags |= stc.STC_FIND_MATCHCASE
+        if findData.Flags & wx.FR_WHOLEWORD: flags |= stc.STC_FIND_WHOLEWORD
         self.SetSearchFlags(flags)
         
         backward = not (findData.Flags & wx.FR_DOWN)
-        findstring = findData.FindString
+        findstring = findData.FindString.encode()
         if backward:
             self.TargetStart = self.anchor  # backward anchor
             self.TargetEnd = 0
@@ -1353,20 +1358,37 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         
         ## Was it still not found?
         if loc == -1:
-            wx.MessageBox("Unable to find the search text.",
-                          "Not found!", wx.OK|wx.ICON_INFORMATION)
-            if findDlg:
-                wx.CallAfter(findDlg.SetFocus)
-            return False
-        
-        self.SetSelection(loc, loc + len(findstring))
-        self.EnsureVisible(self.cline)  # expand if folded
-        self.EnsureCaretVisible()
-        return True
+            ## wx.MessageBox("Unable to find the search text any more.",
+            ##               "Not found!", wx.OK|wx.ICON_INFORMATION)
+            wx.Bell()
+            pass
+        else:
+            self.SetSelection(loc, loc + len(findstring))
+            self.EnsureVisible(self.cline)  # expand if folded
+            self.EnsureCaretVisible()
+        return loc
     
-    ## --------------------------------
-    ## Search functions
-    ## --------------------------------
+    def DoReplaceNext(self, findData):
+        if self.SelectedText == findData.FindString:
+            if self.CanEdit():
+                self.ReplaceSelection(findData.ReplaceString)
+        return self.DoFindNext(findData)
+    
+    def DoReplaceAll(self, findData):
+        with self.save_excursion():
+            locs = [-1]
+            count = 0
+            while 1:
+                loc = self.DoFindNext(findData)
+                if loc in locs:
+                    break
+                locs.append(loc)
+                self.TargetStart = self.anchor
+                self.TargetEnd = self.cpos
+                if self.CanEdit():
+                    self.ReplaceTarget(findData.ReplaceString)
+                    count += 1
+            return count
     
     def get_right_paren(self, p):
         if self.get_char(p) in "({[<": # left-parentheses, <
@@ -1453,21 +1475,6 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     def grep(self, pattern, flags=re.M):
         yield from re.finditer(pattern.encode(), self.TextRaw, flags)
     
-    def search_text(self, text, mode=True):
-        """Yields positions where `text` is found.
-        If mode is True, search by word; otherwise, search by string.
-        """
-        text = text.encode()
-        pos = -1
-        p = re.compile(r"[a-zA-Z0-9_]")
-        while 1:
-            pos = self.TextRaw.find(text, pos+1)
-            if pos < 0:
-                break
-            if mode and p.search(self.get_char(pos-1) + self.get_char(pos+len(text))):
-                continue
-            yield pos
-    
     def filter_text(self):
         """Show indicators for the selected text."""
         self.__itextlines = []
@@ -1478,14 +1485,18 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         if not text:
             self.message("No words")
             return
-        wholeword = (not self.SelectedText)  # Enable or disable whole word search.
-        lw = len(text.encode())
+        wholeword = (not self.SelectedText  # Enable or disable whole word search.
+                     and text.isascii())    # whole word search is for ascii only. (単語境界が不明確のため)
+        pattern = re.escape(text)
+        if wholeword:
+            pattern = rf"\b{pattern}\b"
         lines = []
-        for p in self.search_text(text, wholeword):
+        for m in self.grep(pattern):
+            p, q = m.span()
             lines.append(self.LineFromPosition(p))
             for i in (10, 11,):
                 self.SetIndicatorCurrent(i)
-                self.IndicatorFillRange(p, lw)
+                self.IndicatorFillRange(p, q-p)
         self.__itextlines = sorted(set(lines))  # keep order, no duplication
         self.message("{}: {} found".format(text, len(lines)))
         try:
@@ -1800,7 +1811,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         """
         self.eat_white_forward()
         _text, lp = self.CurLine
-        for i in range(lp % 4 or 4):
+        for _i in range(lp % 4 or 4):
             p = self.cpos
             if p == self.bol or self.get_char(p-1) != ' ':
                 break
@@ -1952,9 +1963,9 @@ class Buffer(EditorInterface, EditWindow):
             None : {
                  'buffer_saved' : [ None, dispatch ],
                 'buffer_loaded' : [ None, dispatch ],
-              'buffer_modified' : [ None, dispatch, self.on_modified ],
-             'buffer_activated' : [ None, dispatch, self.on_activated ],
-           'buffer_inactivated' : [ None, dispatch, self.on_inactivated ],
+              'buffer_modified' : [ None, dispatch, self.on_buffer_modified ],
+             'buffer_activated' : [ None, dispatch, self.on_buffer_activated ],
+           'buffer_inactivated' : [ None, dispatch, self.on_buffer_inactivated ],
        'buffer_region_executed' : [ None, dispatch ],
             },
             -1 : { # original action of the EditWindow
@@ -2079,7 +2090,7 @@ class Buffer(EditorInterface, EditWindow):
                 ## Note: post-call for the confirmation dialog.
                 wx.CallAfter(self.parent.load_file, url)
     
-    def on_modified(self, buf):
+    def on_buffer_modified(self, buf):
         """Called when the buffer is modified."""
         self.SetIndicatorCurrent(2)
         self.IndicatorClearRange(0, self.TextLength)
@@ -2106,12 +2117,12 @@ class Buffer(EditorInterface, EditWindow):
             self.handler('quit', evt) # don't enter autocomp
         evt.Skip()
     
-    def on_activated(self, buf):
+    def on_buffer_activated(self, buf):
         """Called when the buffer is activated."""
         self.update_caption()
         self.trace_position()
     
-    def on_inactivated(self, buf):
+    def on_buffer_inactivated(self, buf):
         """Called when the buffer is inactivated."""
         pass
     
@@ -2279,9 +2290,8 @@ class EditorBook(AuiNotebook, CtrlInterface):
         ## So we set the tabs' height to zero to hide them.
         self.TabCtrlHeight = 0
         
-        self.defaultBufferStyle = dict(
-            ReadOnly = False,
-        )
+        self.defaultBufferStyle = {}
+        
         self.parent = parent #: parent<ShellFrame> is not Parent<AuiNotebook>
         self.Name = name
         self.default_name = "*{}*".format(name.lower()) # e.g. '*scratch*'
@@ -2306,8 +2316,8 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 'buffer_loaded' : [ None, dispatch ],
                'buffer_deleted' : [ None, dispatch ],
               'buffer_modified' : [ None, dispatch ],
-             'buffer_activated' : [ None, dispatch, self.on_activated ],
-           'buffer_inactivated' : [ None, dispatch, self.on_inactivated ],
+             'buffer_activated' : [ None, dispatch, self.on_buffer_activated ],
+           'buffer_inactivated' : [ None, dispatch, self.on_buffer_inactivated ],
        'buffer_caption_updated' : [ None, dispatch ],
             },
             0 : { # Normal mode
@@ -2373,12 +2383,12 @@ class EditorBook(AuiNotebook, CtrlInterface):
             for buf in self.get_all_buffers():
                 _setattribute(buf, self.defaultBufferStyle)
     
-    def on_activated(self, buf):
+    def on_buffer_activated(self, buf):
         """Called when the buffer is activated."""
         title = "{} file: {}".format(self.Name, buf.filename)
         self.parent.handler('title_window', title)
     
-    def on_inactivated(self, buf):
+    def on_buffer_inactivated(self, buf):
         """Called when the buffer is inactivated."""
         pass
     
@@ -2444,7 +2454,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         """Create a new default buffer."""
         buf = self.default_buffer
         if not buf or buf.mtdelta is not None: # is saved?
-            buf = self.create_buffer(self.default_name, index=0)
+            buf = self.create_buffer(self.default_name)
             self.default_buffer = buf
         else:
             buf.ClearAll()
@@ -2803,7 +2813,7 @@ class Nautilus(EditorInterface, Shell):
         """Reset the shell target object; Rename the parent title.
         """
         if not hasattr(obj, '__dict__'):
-            raise TypeError("primitive objects cannot be targets")
+            raise TypeError("invalid target")
         
         self.__target = obj
         self.locals = obj.__dict__
@@ -2812,7 +2822,8 @@ class Nautilus(EditorInterface, Shell):
         try:
             obj.self = obj
             obj.this = inspect.getmodule(obj)
-            obj.shell = self # overwrite the facade <wx.py.shell.ShellFacade>
+            obj.shell = self  # Overwrite the facade <wx.py.shell.ShellFacade>.
+            obj.__name__ = typename(obj)  # A namespace for ghost in the shell. cf. exec_region
         except AttributeError:
             pass
         self.parent.handler('title_window', obj)
@@ -2901,10 +2912,10 @@ class Nautilus(EditorInterface, Shell):
         self.handler.update({ # DNA<Nautilus>
             None : {
                  'interp_error' : [ None, self.on_interp_error ],
-                'shell_deleted' : [ None, dispatch, self.on_deleted ],
+                'shell_deleted' : [ None, dispatch, self.on_shell_deleted ],
                'shell_modified' : [ None, dispatch ],
-              'shell_activated' : [ None, dispatch, self.on_activated ],
-            'shell_inactivated' : [ None, dispatch, self.on_inactivated ],
+              'shell_activated' : [ None, dispatch, self.on_shell_activated ],
+            'shell_inactivated' : [ None, dispatch, self.on_shell_inactivated ],
             },
             -1 : { # original action of the wx.py.shell
                     '* pressed' : (0, skip, self.on_exit_escmap),
@@ -3186,7 +3197,7 @@ class Nautilus(EditorInterface, Shell):
             if text[:lp] == sys.ps2:
                 self.cpos -= lp        # Select ps2:prompt
                 self.WordLeftExtend()  # Select cr/lf chunks
-            else: 
+            else:
                 q = max(self.bol, self.bolc) # for debugger mode: bol <= bolc
                 if self.cpos > q:
                     self.cpos = q
@@ -3248,9 +3259,9 @@ class Nautilus(EditorInterface, Shell):
     def on_exit_escmap(self, evt):
         self.CaretPeriod = self.__caret_mode
         self.message("ESC {}".format(evt.key))
-        if self.eolc < self.bolc: # check if prompt is in valid state
+        if self.eolc < self.bolc:  # Check if prompt is in valid state.
             self.goto_char(self.eolc)
-            self.promptPosEnd = 0
+            self.promptPosEnd = 0  # Enabale write(prompt).
             self.prompt()
         self.AnnotationClearAll()
     
@@ -3264,7 +3275,7 @@ class Nautilus(EditorInterface, Shell):
         self.noteMode = False
         self.CaretForeground = self.__caret_mode
         self.goto_char(self.eolc)
-        self.promptPosEnd = 0
+        self.promptPosEnd = 0  # Enabale write(prompt).
         self.prompt()
         self.message("")
     
@@ -3380,7 +3391,7 @@ class Nautilus(EditorInterface, Shell):
             lhs += c # store in lhs; no more processing
         return lhs
     
-    def on_deleted(self, shell):
+    def on_shell_deleted(self, shell):
         """Called before shell:self is killed.
         Delete target shell to prevent referencing the dead shell.
         """
@@ -3393,21 +3404,21 @@ class Nautilus(EditorInterface, Shell):
                 pass
         wx.CallAfter(_del)
     
-    def on_activated(self, shell):
+    def on_shell_activated(self, shell):
         """Called when the shell:self is activated.
-        Reset localvars assigned for the shell target.
+        Reset localvars assigned for the shell target. cf. target.setter.
         """
         self.trace_position()
         obj = self.target
         try:
             obj.self = obj
             obj.this = inspect.getmodule(obj)
-            obj.shell = self # overwrite the facade <wx.py.shell.ShellFacade>
+            obj.shell = self  # Overwrite the facade <wx.py.shell.ShellFacade>
         except AttributeError:
             pass
         self.parent.handler('title_window', obj)
     
-    def on_inactivated(self, shell):
+    def on_shell_inactivated(self, shell):
         """Called when shell:self is inactivated.
         Remove target localvars assigned for the shell target.
         """
@@ -3554,14 +3565,26 @@ class Nautilus(EditorInterface, Shell):
             ## shell.__init__ よりも先に実行される
             pass
     
+    def setBuiltinKeywords(self):
+        """Create pseudo keywords as part of builtins.
+        
+        (override) Don't add `close`, `exit` and `quit` to builtins.
+        """
+        from wx.py.path import ls, cd, pwd, sx
+        builtins.cd = cd
+        builtins.ls = ls
+        builtins.pwd = pwd
+        builtins.sx = sx
+    
     def execStartupScript(self, su):
         """Execute the user's PYTHONSTARTUP script if they have one.
         
         (override) Add globals when executing su:startupScript.
-                   Fix history point.
+                   Don't add '_f' to globals when executing su:startupScript.
+                   Don't add intro text in the history.
         """
-        keys = set(self.locals.keys()) # check for locals map changes
-        self.promptPosEnd = self.TextLength # fix history point
+        keys = set(self.locals.keys())  # to check for locals map changes.
+        self.promptPosEnd = self.TextLength  # Fix history point
         if su and os.path.isfile(su):
             self.push("print('Startup script executed:', {0!r})\n".format(su))
             self.push("with open({0!r}) as _f: exec(_f.read())\n".format(su))
@@ -3703,10 +3726,6 @@ class Nautilus(EditorInterface, Shell):
             self.write(cmd)
             self.processLine()
     
-    ## --------------------------------
-    ## Autocomp actions of the shell
-    ## --------------------------------
-    
     def eval_line(self):
         """Evaluate the selected word or line and show calltips."""
         if self.CallTipActive():

mwx/plugins/ffmpeg_view.py

@@ -1,7 +1,6 @@
 #! python3
 """FFmpeg wrapper.
 """
-from functools import partial
 from subprocess import Popen, PIPE
 import numpy as np
 import os
@@ -151,9 +150,9 @@ class Plugin(Layer):
             },
         })
         
-        self.mc.Bind(wx.media.EVT_MEDIA_PAUSE, partial(self.handler, 'pause'))
-        self.mc.Bind(wx.media.EVT_MEDIA_PLAY, partial(self.handler, 'play'))
-        self.mc.Bind(wx.media.EVT_MEDIA_STOP, partial(self.handler, 'stop'))
+        self.mc.Bind(wx.media.EVT_MEDIA_PAUSE, lambda v: self.handler('pause', v))
+        self.mc.Bind(wx.media.EVT_MEDIA_PLAY, lambda v: self.handler('play', v))
+        self.mc.Bind(wx.media.EVT_MEDIA_STOP, lambda v: self.handler('stop', v))
         
         self.mc.Bind(wx.EVT_KEY_DOWN, self.on_hotkey_down)
         self.mc.Bind(wx.EVT_KEY_UP, self.on_hotkey_up)

mwx/plugins/fft_view.py

@@ -3,7 +3,7 @@
 """
 import wx
 import numpy as np
-from numpy.fft import fft2,ifft2,fftshift,ifftshift
+from numpy.fft import fft2, ifft2, fftshift, ifftshift
 
 from mwx.graphman import Layer
 from mwx.controls import Param
@@ -74,7 +74,7 @@ class Plugin(Layer):
             
             if self.ftor.check:
                 y, x = np.ogrid[-h/2:h/2, -w/2:w/2]
-                mask = np.hypot(y,x) > w / self.ftor.value
+                mask = np.hypot(y, x) > w / self.ftor.value
                 src = src.copy() # apply mask to the copy
                 src[mask] = 0
             

mwx/plugins/frame_listview.py

@@ -52,7 +52,7 @@ class CheckList(wx.ListCtrl, ListCtrlAutoWidthMixin, CtrlInterface):
         self.__dir = True
         
         _alist = ( # assoc-list of column names
-            ("id", 42),
+            ("id", 45),
             ("name", 160),
             ("shape", 90),
             ("dtype", 60),

mwx/testsuite.py

@@ -17,7 +17,7 @@ Is equivalent to:
 from contextlib import contextmanager
 import wx
 
-__all__ = ["testApp", "testFrame", "Plugman", "testPanel"]
+__all__ = ["testApp", "testFrame", "testPlugin", "testPanel"]
 
 
 @contextmanager
@@ -38,15 +38,6 @@ def testFrame(**kwargs):
 ## wx.Frame.run = staticmethod(testFrame)
 
 
-@contextmanager
-def Plugman(**kwargs):
-    import mwx.graphman
-    with testApp():
-        frm = mwx.graphman.Frame(None, **kwargs)
-        yield frm
-        frm.Show()
-
-
 @contextmanager
 def testPanel(**kwargs):
     import mwx
@@ -56,3 +47,12 @@ def testPanel(**kwargs):
         yield panel
         panel.Sizer.Fit(frm)
         frm.Show()
+
+
+@contextmanager
+def testPlugin(**kwargs):
+    import mwx.graphman
+    with testApp():
+        frm = mwx.graphman.Frame(None, **kwargs)
+        yield frm
+        frm.Show()