mwxlib 0.98.1__py3-none-any.whl → 0.98.6__py3-none-any.whl

mwx/nutshell.py

@@ -10,7 +10,6 @@ import traceback
 import inspect
 import builtins
 import operator
-import dis
 import pydoc
 import keyword
 import linecache
@@ -102,12 +101,13 @@ class AutoCompInterfaceMixin:
         (override) Snip the tip of max N lines if it is too long.
                    Keep the tip for calltip-click event.
         """
-        self._calltips = (pos, tip)
+        self._calltips = [pos, tip, False]
         lines = tip.splitlines()
         if N and len(lines) > N > 0:
             lines[N+1:] = ["\n...(snip) This tips are too long... "
                            "Click to show more details."]
             tip = '\n'.join(lines)
+            self._calltips[-1] = True # snipped (needs to be shown)
         super().CallTipShow(pos, tip)
     
     def autoCallTipShow(self, command, insertcalltip=True):
@@ -142,7 +142,7 @@ class AutoCompInterfaceMixin:
                 self.message("- {} : {!r}".format(e, text))
     
     def call_helpTip(self, evt):
-        """Show tooltips for the selected topic."""
+        """Show a calltip for the selected function."""
         if self.CallTipActive():
             self.CallTipCancel()
         
@@ -174,8 +174,11 @@ class AutoCompInterfaceMixin:
             n = len(self.__comp_hint)
             p = self.cpos
             if not self.SelectedText:
-                p, self.anchor, sty = self.get_following_atom(p) # word-right-selection
-            self.ReplaceSelection(word[n:]) # Modify (or insert) the selected range
+                p, q, sty = self.get_following_atom(p) # word-right-selection
+                if sty == 'word':
+                    self.anchor = q
+            with self.off_undocollection():
+                self.ReplaceSelection(word[n:])
             self.cpos = p # backward selection to the point
             self.__comp_ind = j
         except IndexError:
@@ -264,7 +267,7 @@ class AutoCompInterfaceMixin:
                     self.message("[module]>>> loading {}...".format(text))
                     modules = set(dir(import_module(text)))
                 except ImportError as e:
-                    self.message("\b failed:", e)
+                    self.message("\b failed.", e)
                     return
                 else:
                     ## Add unimported module names.
@@ -356,7 +359,7 @@ class AutoCompInterfaceMixin:
             self.message("- {} : {!r}".format(e, text))
 
 
-class EditorInterface(CtrlInterface):
+class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     """Interface of Python code editor.
     
     Note:
@@ -364,6 +367,7 @@ class EditorInterface(CtrlInterface):
     """
     def __init__(self):
         CtrlInterface.__init__(self)
+        AutoCompInterfaceMixin.__init__(self)
         
         def dispatch(evt):
             """Fork events to the parent."""
@@ -414,8 +418,8 @@ class EditorInterface(CtrlInterface):
                 'C-S-; pressed' : (0, _F(self.comment_out_line)),
                   'C-: pressed' : (0, _F(self.uncomment_line)),
                 'C-S-: pressed' : (0, _F(self.uncomment_line)),
-                  'select_line' : (100, self.on_linesel_begin),
-                 'select_lines' : (100, self.on_linesel_next),
+                  'select_line' : (11, self.on_linesel_begin),
+                 'select_lines' : (11, self.on_linesel_next),
             },
             10 : {
                          'quit' : (0, self.on_itext_exit),
@@ -424,8 +428,8 @@ class EditorInterface(CtrlInterface):
                  'down pressed' : (10, skip),
                 'enter pressed' : (0, self.on_itext_selection),
             },
-            100 : {
-                  '*Ldrag move' : (100, self.on_linesel_motion),
+            11 : {
+                  '*Ldrag move' : (11, self.on_linesel_motion),
                  'capture_lost' : (0, self.on_linesel_end),
              'Lbutton released' : (0, self.on_linesel_end),
             },
@@ -871,22 +875,10 @@ class EditorInterface(CtrlInterface):
                 q = self.cpos
             return self.GetTextRange(p, q)
     
-    def gen_text_at_caret(self):
-        """Generates the selected text,
-        otherwise the line or expression at the caret.
-        """
-        def _gen_text():
-            text = self.SelectedText
-            if text:
-                yield text
-            else:
-                yield self.line_at_caret
-                yield self.expr_at_caret
-        return filter(None, _gen_text())
-    
     ## --------------------------------
     ## Python syntax and indentation
     ## --------------------------------
+    
     def on_indent_line(self, evt):
         if self.SelectedText:
             evt.Skip()
@@ -1191,10 +1183,10 @@ class EditorInterface(CtrlInterface):
         """
         n = self.LinesOnScreen() # lines completely visible
         m = n//2 if ln is None else ln % n if ln < n else n # ln[0:n]
-        vl = self.calc_vline(self.cline)
+        vl = self._calc_vline(self.cline)
         self.ScrollToLine(vl - m)
     
-    def calc_vline(self, line):
+    def _calc_vline(self, line):
         """Virtual line numberin the buffer window."""
         pos = self.PositionFromLine(line)
         w, h = self.PointFromPosition(pos)
@@ -1206,7 +1198,7 @@ class EditorInterface(CtrlInterface):
         """
         n = self.LinesOnScreen() # lines completely visible
         hl = self.FirstVisibleLine
-        vl = self.calc_vline(line)
+        vl = self._calc_vline(line)
         if vl < hl:
             self.ScrollToLine(vl)
         elif vl > hl + n - 1:
@@ -1219,7 +1211,7 @@ class EditorInterface(CtrlInterface):
         """
         n = self.LinesOnScreen() # lines completely visible
         hl = self.FirstVisibleLine
-        vl = self.calc_vline(line)
+        vl = self._calc_vline(line)
         if not hl + offset < vl < hl + n - 1 - offset:
             self.ScrollToLine(vl - n//2)
     
@@ -1512,16 +1504,6 @@ class EditorInterface(CtrlInterface):
             else:
                 self.anchor = q
     
-    @contextmanager
-    def off_readonly(self):
-        """Set buffer to be writable (ReadOnly=False) temporarily."""
-        r = self.ReadOnly
-        try:
-            self.ReadOnly = 0
-            yield
-        finally:
-            self.ReadOnly = r
-    
     @contextmanager
     def save_attributes(self, **kwargs):
         """Save buffer attributes (e.g. ReadOnly=False)."""
@@ -1534,6 +1516,14 @@ class EditorInterface(CtrlInterface):
             for k, v in kwargs.items():
                 setattr(self, k, v)
     
+    def off_readonly(self):
+        """Disables buffer read-only lock temporarily."""
+        return self.save_attributes(ReadOnly=False)
+    
+    def off_undocollection(self):
+        """Disables buffer undo stack temporarily."""
+        return self.save_attributes(UndoCollection=False)
+    
     ## --------------------------------
     ## Edit: comment / insert / kill
     ## --------------------------------
@@ -1640,7 +1630,7 @@ class EditorInterface(CtrlInterface):
         self.ReplaceSelection('')
 
 
-class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
+class Buffer(EditorInterface, EditWindow):
     """Python code buffer.
     
     Attributes:
@@ -1766,7 +1756,6 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
     def __init__(self, parent, filename=None, **kwargs):
         EditWindow.__init__(self, parent, **kwargs)
         EditorInterface.__init__(self)
-        AutoCompInterfaceMixin.__init__(self)
         
         self.parent = parent
         self.__filename = filename
@@ -1795,18 +1784,18 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
         def clear(evt):
             ## """Clear selection and message, no skip."""
             ## *do not* clear autocomp, so that the event can skip to AutoComp properly.
-            ## if self.AutoCompActive():
-            ##     self.AutoCompCancel() # may delete selection
             if self.CanEdit():
-                self.ReplaceSelection("")
+                with self.off_undocollection():
+                    self.ReplaceSelection("")
             self.message("")
         
         def clear_autocomp(evt):
-            ## """Clear Autocomp, selection, and message."""
+            ## """Clear autocomp, selection, and message."""
             if self.AutoCompActive():
                 self.AutoCompCancel()
             if self.CanEdit():
-                self.ReplaceSelection("")
+                with self.off_undocollection():
+                    self.ReplaceSelection("")
             self.message("")
         
         def fork(evt):
@@ -1840,7 +1829,7 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
                    '* released' : (0, skip, dispatch),
                'escape pressed' : (-1, self.on_enter_escmap),
                   'C-h pressed' : (0, self.call_helpTip),
-                    '. pressed' : (2, skip),
+                    '. pressed' : (2, self.OnEnterDot),
                   'M-. pressed' : (2, self.call_word_autocomp),
                   'M-/ pressed' : (3, self.call_apropos_autocomp),
             },
@@ -1922,7 +1911,9 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
     def OnCallTipClick(self, evt):
         if self.CallTipActive():
             self.CallTipCancel()
-        self.CallTipShow(*self._calltips, N=None)
+        pos, tip, more = self._calltips
+        if more:
+            self.CallTipShow(pos, tip, N=None)
         evt.Skip()
     
     def OnIndicatorClick(self, evt):
@@ -1960,6 +1951,14 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
         self.update_caption()
         evt.Skip()
     
+    def OnEnterDot(self, evt):
+        p = self.cpos
+        st = self.get_style(p-1)
+        rst = self.get_style(p)
+        if st not in ('moji', 'word', 'rparen') or rst == 'word':
+            self.handler('quit', evt) # don't enter autocomp
+        evt.Skip()
+    
     def on_activated(self, buf):
         """Called when the buffer is activated."""
         self.update_caption()
@@ -2052,6 +2051,22 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
         dispatcher.send(signal='Interpreter.push',
                         sender=self, command=None, more=False)
     
+    def gen_text_at_caret(self):
+        """Generates the selected text,
+        otherwise the line or expression at the caret.
+        """
+        def _gen_text():
+            text = self.SelectedText
+            if text:
+                yield text
+            else:
+                yield self.line_at_caret
+                yield self.expr_at_caret
+        return filter(None, _gen_text())
+    
+    def eval_line(self):
+        self.py_eval_line(self.globals, self.locals)
+    
     def py_eval_line(self, globals=None, locals=None):
         if self.CallTipActive():
             self.CallTipCancel()
@@ -2068,6 +2083,9 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
                 return
         self.message(status)
     
+    def exec_region(self):
+        self.py_exec_region(self.globals, self.locals)
+    
     def py_exec_region(self, globals=None, locals=None, filename=None):
         if not filename:
             filename = self.filename
@@ -2100,23 +2118,6 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
             self.handler('buffer_region_executed', self)
             self.message("Evaluated {!r} successfully.".format(filename))
             self.AnnotationClearAll()
-    
-    def py_get_region(self, line):
-        """Line numbers of code head and tail containing the line.
-        
-        Requires a code object.
-        If the code doesn't exist, return the folding region.
-        """
-        if not self.code:
-            return self.get_region(line)
-        lc, le = 0, self.LineCount
-        linestarts = list(dis.findlinestarts(self.code))
-        for i, ln in reversed(linestarts):
-            if line >= ln-1:
-                lc = ln-1
-                break
-            le = ln-1
-        return lc, le
 
 
 class EditorBook(AuiNotebook, CtrlInterface):
@@ -2402,7 +2403,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 return True
             return False
         except Exception as e:
-            self.post_message(f"Failed to load {filename!r}:", e)
+            self.post_message(f"Failed to load {filename!r}.", e)
             self.delete_buffer(buf)
             return False
     
@@ -2410,6 +2411,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         """Open the specified file."""
         if not filename:
             with wx.FileDialog(self, "Open buffer",
+                    defaultDir=os.path.dirname(self.buffer.filename),
                     wildcard='|'.join(self.wildcards),
                     style=wx.FD_OPEN|wx.FD_MULTIPLE) as dlg:
                 if dlg.ShowModal() == wx.ID_OK:
@@ -2444,7 +2446,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                 return True
             return False
         except Exception as e:
-            self.post_message(f"Failed to save {filename!r}:", e)
+            self.post_message(f"Failed to save {filename!r}.", e)
             return False
     
     def load_buffer(self, buf=None):
@@ -2477,6 +2479,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         """Confirm the saveas with the dialog."""
         buf = buf or self.buffer
         with wx.FileDialog(self, "Save buffer as",
+                defaultDir=os.path.dirname(self.buffer.filename),
                 defaultFile=re.sub(r'[\/:*?"<>|]', '_', buf.name),
                 wildcard='|'.join(self.wildcards),
                 style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) as dlg:
@@ -2519,11 +2522,10 @@ class EditorBook(AuiNotebook, CtrlInterface):
 class Interpreter(interpreter.Interpreter):
     """Interpreter based on code.InteractiveInterpreter.
     """
-    def __init__(self, *args, **kwargs):
-        parent = kwargs.pop('interpShell')
+    def __init__(self, interpShell, *args, **kwargs):
         interpreter.Interpreter.__init__(self, *args, **kwargs)
         
-        self.parent = parent
+        self.parent = interpShell
         self.globals = self.locals
     
     def runcode(self, code):
@@ -2587,7 +2589,7 @@ class Interpreter(interpreter.Interpreter):
             return interpreter.Interpreter.getCallTip(self) # dummy
 
 
-class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
+class Nautilus(EditorInterface, Shell):
     """Nautilus in the Shell.
     
     Facade objects for accessing the APIs:
@@ -2624,8 +2626,8 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
     
         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, M-j    : [0] tooltip of eval (for the selected or focused word)
+        C-h, M-h    : [0] calltip of help (for the selected or focused func)
         TAB         : [1] history-comp
         M-p         : [1] retrieve previous history in history-comp mode
         M-n         : [1] retrieve next history in history-comp mode
@@ -2697,7 +2699,9 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
             raise TypeError("primitive objects cannot be targeted")
         
         self.__target = obj
-        self.interp.locals = obj.__dict__
+        self.locals = obj.__dict__
+        self.globals = obj.__dict__
+        self.globals.update(self.__globals)
         try:
             obj.self = obj
             obj.this = inspect.getmodule(obj)
@@ -2730,9 +2734,9 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
     @globals.deleter
     def globals(self): # internal use only
         self.interp.globals = self.__target.__dict__
+        self.interp.globals.update(self.__globals)
     
-    ## (override)
-    wrap = EditorInterface.wrap
+    __globals = {}
     
     def __init__(self, parent, target, name="root",
                  introText=None,
@@ -2741,14 +2745,13 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
                  **kwargs):
         Shell.__init__(self, parent,
                  locals=target.__dict__,
-                 interpShell=self,
+                 interpShell=self, # **kwds of InterpClass
                  InterpClass=Interpreter,
                  introText=introText,
                  startupScript=startupScript,
-                 execStartupScript=execStartupScript, # if True, executes ~/.py
+                 execStartupScript=execStartupScript, # executes ~/.py
                  **kwargs)
         EditorInterface.__init__(self)
-        AutoCompInterfaceMixin.__init__(self)
         
         self.parent = parent #: parent<ShellFrame> is not Parent<AuiNotebook>
         self.target = target
@@ -2780,28 +2783,20 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
         def clear(evt):
             ## """Clear selection and message, no skip."""
             ## *do not* clear autocomp, so that the event can skip to AutoComp properly.
-            ## if self.AutoCompActive():
-            ##     self.AutoCompCancel() # may delete selection
             if self.CanEdit():
-                self.ReplaceSelection("")
+                with self.off_undocollection():
+                    self.ReplaceSelection("")
             self.message("")
         
         def clear_autocomp(evt):
-            ## """Clear Autocomp, selection, and message."""
+            ## """Clear autocomp, selection, and message."""
             if self.AutoCompActive():
                 self.AutoCompCancel()
             if self.CanEdit():
-                self.ReplaceSelection("")
+                with self.off_undocollection():
+                    self.ReplaceSelection("")
             self.message("")
         
-        def skip_autocomp(evt):
-            ## """Don't eat backward prompt whitespace."""
-            ## Prevent autocomp from eating prompts.
-            ## Quit to avoid backspace over the last non-continuation prompt.
-            if self.cpos == self.bolc:
-                self.handler('quit', evt)
-            evt.Skip()
-        
         def fork(evt):
             self.handler.fork(self.handler.current_event, evt)
         
@@ -2844,7 +2839,6 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
               'C-enter pressed' : (0, _F(self.insertLineBreak)),
             'C-S-enter pressed' : (0, _F(self.insertLineBreak)),
                '*enter pressed' : (0, ), # -> OnShowCompHistory 無効
-                 'left pressed' : (0, self.OnBackspace),
                   'C-[ pressed' : (0, _F(self.goto_previous_mark_arrow)),
                 'C-S-[ pressed' : (0, _F(self.goto_previous_mark_arrow, selection=1)),
                   'C-] pressed' : (0, _F(self.goto_next_mark_arrow)),
@@ -2859,10 +2853,8 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
            '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_helpDoc),
-                'C-S-h pressed' : (0, self.call_helpDoc),
                     '. pressed' : (2, self.OnEnterDot),
                   'tab pressed' : (1, self.call_history_comp),
                   'M-p pressed' : (1, self.call_history_comp),
@@ -2915,7 +2907,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
            'S-[a-z\\] released' : (2, self.call_word_autocomp),
                   '\\ released' : (2, self.call_word_autocomp),
               '*delete pressed' : (2, skip),
-           '*backspace pressed' : (2, skip_autocomp),
+           '*backspace pressed' : (2, self.OnBackspace),
           '*backspace released' : (2, self.call_word_autocomp),
         'C-S-backspace pressed' : (2, ),
                   'C-j pressed' : (2, self.eval_line),
@@ -2943,7 +2935,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
            'S-[a-z\\] released' : (3, self.call_apropos_autocomp),
                   '\\ released' : (3, self.call_apropos_autocomp),
               '*delete pressed' : (3, skip),
-           '*backspace pressed' : (3, skip_autocomp),
+           '*backspace pressed' : (3, self.OnBackspace),
           '*backspace released' : (3, self.call_apropos_autocomp),
         'C-S-backspace pressed' : (3, ),
                   'C-j pressed' : (3, self.eval_line),
@@ -2971,7 +2963,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
            'S-[a-z\\] released' : (4, self.call_text_autocomp),
                   '\\ released' : (4, self.call_text_autocomp),
               '*delete pressed' : (4, skip),
-           '*backspace pressed' : (4, skip_autocomp),
+           '*backspace pressed' : (4, self.OnBackspace),
           '*backspace released' : (4, self.call_text_autocomp),
         'C-S-backspace pressed' : (4, ),
                   'C-j pressed' : (4, self.eval_line),
@@ -3000,7 +2992,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
                   '\\ released' : (5, self.call_module_autocomp),
                   'M-m pressed' : (5, _F(self.call_module_autocomp, force=1)),
               '*delete pressed' : (5, skip),
-           '*backspace pressed' : (5, skip_autocomp),
+           '*backspace pressed' : (5, self.OnBackspace),
           '*backspace released' : (5, self.call_module_autocomp),
         'C-S-backspace pressed' : (5, ),
                  '*alt pressed' : (5, ),
@@ -3076,12 +3068,11 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
         evt.Skip()
     
     def OnBackspace(self, evt):
-        """Called when backspace (or left key) pressed.
-        Backspace-guard from Autocomp eating over a prompt whitespace
+        """Called when backspace pressed.
+        Backspace-guard from autocomp eating over a prompt whitespace.
         """
         if self.cpos == self.bolc:
-            ## do not skip to prevent autocomp eats prompt,
-            ## so not to backspace over the latest non-continuation prompt
+            self.handler('quit', evt) # don't eat backward prompt
             return
         evt.Skip()
     
@@ -3153,7 +3144,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
             self.ReplaceSelection('self')
         elif st not in ('moji', 'word', 'rparen') or rst == 'word':
             self.handler('quit', evt) # don't enter autocomp
-        self.ReplaceSelection('.') # just write down a dot.
+        evt.Skip()
     
     def on_enter_escmap(self, evt):
         self.__caret_mode = self.CaretPeriod
@@ -3203,7 +3194,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
     def magic(self, cmd):
         """Called before command pushed.
         
-        (override) disable old magic: `f x --> f(x)`
+        (override) Disable old magic: `f x --> f(x)`.
         """
         if cmd:
             if cmd[0:2] == '??': cmd = 'help({})'.format(cmd[2:])
@@ -3461,7 +3452,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
         (override) Add globals when executing su:startupScript.
                    Fix history point.
         """
-        ## self.globals = self.locals
+        keys = set(self.locals.keys()) # 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))
@@ -3471,6 +3462,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
         else:
             self.push("")
             self.interp.startupScript = None
+        self.__globals = {k: self.locals[k] for k in (self.locals.keys() - keys)}
     
     def Paste(self, rectangle=False):
         """Replace selection with clipboard contents.
@@ -3616,9 +3608,22 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
         self.cpos, self.anchor = self.anchor, self.cpos
         self.EnsureCaretVisible()
     
-    def eval_line(self, evt):
-        """Evaluate the selected word or line.
+    def gen_text_at_caret(self):
+        """Generates the selected text,
+        otherwise the line or expression at the caret.
+        (override) Generates command line (that starts with a prompt).
         """
+        def _gen_text():
+            text = self.SelectedText
+            if text:
+                yield text
+            else:
+                yield self.getCommand() # self.line_at_caret
+                yield self.expr_at_caret
+        return filter(None, _gen_text())
+    
+    def eval_line(self, evt):
+        """Evaluate the selected word or line."""
         if self.CallTipActive():
             self.CallTipCancel()
         

mwx/plugins/ffmpeg_view.py

@@ -122,7 +122,7 @@ class Plugin(Layer):
             (1, "&Load file", Icon('open'),
                 lambda v: self.load_media()),
                 
-            (2, "&Snapshot", Icon('clock'),
+            (2, "&Snapshot", Icon('clip'),
                 lambda v: self.snapshot(),
                 lambda v: v.Enable(self._path is not None)),
             (),
@@ -175,7 +175,7 @@ class Plugin(Layer):
     def load_media(self, path=None):
         if path is None:
             with wx.FileDialog(self, "Choose a media file",
-                style=wx.FD_OPEN|wx.FD_CHANGE_DIR|wx.FD_FILE_MUST_EXIST) as dlg:
+                    style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST) as dlg:
                 if dlg.ShowModal() != wx.ID_OK:
                     return None
                 path = dlg.Path

mwx/utilus.py

@@ -886,7 +886,7 @@ class FSM(dict):
         return False
 
 
-class TreeList(object):
+class TreeList:
     """Interface class for tree list control.
     
     >>> list[item:(key,value)]