mwxlib 0.94.7__py3-none-any.whl → 0.95.0__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 deb, App, Frame, MiniFrame, ShellFrame
+from .framework import Frame, MiniFrame, ShellFrame, deb
 
 ## Controls
 ## from . import controls

mwx/bookshelf.py

@@ -27,8 +27,7 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
                'buffer_deleted' : [ None, self.on_buffer_deleted ],
              'buffer_activated' : [ None, self.on_buffer_selected ],
            'buffer_inactivated' : [ None, ],
-         'buffer_caption_reset' : [ None, self.on_buffer_filename ],
-        'buffer_filename_reset' : [ None, self.on_buffer_filename ],
+       'buffer_caption_updated' : [ None, self.on_buffer_filename ],
             },
         }
         
@@ -43,12 +42,14 @@ class EditorTreeCtrl(wx.TreeCtrl, CtrlInterface):
                 data.SetFocus()
         
         @self.handler.bind('f5 pressed')
-        def refresh(v):
-            self.build_tree(clear=0)
+        def refresh(v, clear=False):
+            self.build_tree(clear)
             if self.target:
                 self.target.current_editor.SetFocus()
                 wx.CallAfter(self.SetFocus)
         
+        self.handler.bind('S-f5 pressed', partial(refresh, clear=1))
+        
         @self.handler.bind('delete pressed')
         def delete(v):
             data = self.GetItemData(self.Selection)

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.94.7"
+__version__ = "0.95.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -55,21 +55,17 @@ def deb(target=None, loop=True, locals=None, **kwargs):
     kwargs.setdefault("execStartupScript", True)
     kwargs.setdefault("ensureClose", True)
     
-    with App(loop):
+    app = wx.GetApp() or wx.App()
+    try:
         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()
-    yield app
-    if loop and not app.GetMainLoop():
-        app.MainLoop()
+    finally:
+        if loop and not app.GetMainLoop():
+            app.MainLoop()
 
 
 def postcall(f):
@@ -1252,7 +1248,7 @@ class ShellFrame(MiniFrame):
                       'add_log' : [ None, self.add_log ],
                      'add_help' : [ None, self.add_help ],
                  'title_window' : [ None, self.on_title_window ],
-         'buffer_caption_reset' : [ None, self.on_buffer_caption ], # => self.OnActivate
+       'buffer_caption_updated' : [ None, self.on_buffer_caption ], # => self.OnActivate
             },
             0 : {
                     '* pressed' : (0, fork_debugger),
@@ -1262,9 +1258,9 @@ 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, doc="Toggle ghost")),
-                'S-f11 pressed' : (0, _F(self.toggle_window, self.watcher, doc="Toggle watcher")),
-                  'f12 pressed' : (0, _F(self.Close, alias="close", doc="Close the window")),
+                  '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')),
+                  'f12 pressed' : (0, _F(self.Close, alias="close")),
              '*f[0-9]* pressed' : (0, ),
             },
         })
@@ -1546,6 +1542,11 @@ class ShellFrame(MiniFrame):
     
     def toggle_window(self, win):
         pane = self._mgr.GetPane(win)
+        if pane.IsDocked():
+            if not self.console.IsShown():
+                self._mgr.RestoreMaximizedPane()
+                self._mgr.Update()
+                return
         self.popup_window(win, not pane.IsShown())
     
     def popup_window(self, win, show=True):
@@ -1698,8 +1699,9 @@ class ShellFrame(MiniFrame):
                 self.debugger.debug(obj, *args, **kwargs)
             elif isinstance(obj, str):
                 filename = "<string>"
-                buf = self.Scratch.find_buffer(filename)\
-                   or self.Scratch.create_buffer(filename)
+                editor = self.Scratch
+                buf = editor.find_buffer(filename)\
+                   or editor.create_buffer(filename)
                 with buf.off_readonly():
                     buf.Text = obj
                 self.debugger.run(obj, filename)
@@ -1845,6 +1847,7 @@ class ShellFrame(MiniFrame):
             buf.SetText(text)
         ## Overwrite text and popup the window.
         self.popup_window(self.Help)
+        self.Help.swap_page(buf)
     
     def clone_shell(self, target):
         if not hasattr(target, '__dict__'):
@@ -1883,7 +1886,7 @@ class ShellFrame(MiniFrame):
     @property
     def all_shells(self):
         """Yields all books in the notebooks."""
-        yield from self.console.get_pages(type(self.rootshell))
+        return self.console.get_pages(type(self.rootshell))
     
     @property
     def current_shell(self):
@@ -1893,7 +1896,7 @@ class ShellFrame(MiniFrame):
     @property
     def all_editors(self):
         """Yields all editors in the notebooks."""
-        yield from self.ghost.get_pages(type(self.Log))
+        return self.ghost.get_pages(type(self.Log))
     
     @property
     def current_editor(self):
@@ -1904,12 +1907,19 @@ class ShellFrame(MiniFrame):
         return next((x for x in self.all_editors if x.IsShown()), self.Scratch)
     
     def find_editor(self, fn):
-        """Find an editor which has the specified fn:filename or code."""
-        for book in self.all_editors:
+        """Find an editor with the specified fn:filename or code.
+        If found, switch to the buffer page.
+        """
+        return next(self.find_editors(fn), None)
+    
+    def find_editors(self, fn):
+        """Yields all editors with the specified fn:filename or code."""
+        def _f(book):
             buf = book.find_buffer(fn)
             if buf:
                 book.swap_page(buf)
-                return book
+            return buf
+        return filter(_f, self.all_editors)
     
     ## --------------------------------
     ## Find text dialog

mwx/nutshell.py

@@ -1386,15 +1386,13 @@ class Buffer(EditWindow, EditorInterface):
     def filename(self):
         return self.__filename
     
-    @filename.setter
-    def filename(self, fn):
+    def update_filestamp(self, fn):
         if fn and os.path.isfile(fn):
-            self.__mtime = os.path.getmtime(fn)
+            self.__mtime = os.path.getmtime(fn) # update timestamp (modified time)
         else:
             self.__mtime = None
         if self.__filename != fn:
             self.__filename = fn
-            self.parent.handler('buffer_filename_reset', self)
             self.update_caption()
     
     @property
@@ -1408,10 +1406,12 @@ class Buffer(EditWindow, EditorInterface):
             < 0  : a url file
         """
         fn = self.filename
-        if fn and os.path.isfile(fn):
-            return os.path.getmtime(fn) - self.__mtime
-        if fn and re.match(url_re, fn):
-            return -1
+        if fn:
+            if os.path.isfile(fn):
+                return os.path.getmtime(fn) - self.__mtime
+            if re.match(url_re, fn):
+                return -1
+        return None
     
     @property
     def caption_prefix(self):
@@ -1429,9 +1429,10 @@ class Buffer(EditWindow, EditorInterface):
         return prefix
     
     def update_caption(self):
+        caption = self.caption_prefix + self.name
         try:
-            if self.parent.set_caption(self, self.caption_prefix + self.name):
-                self.parent.handler('buffer_caption_reset', self)
+            if self.parent.set_caption(self, caption):
+                self.parent.handler('buffer_caption_updated', self)
         except AttributeError:
             pass
     
@@ -1465,7 +1466,7 @@ class Buffer(EditWindow, EditorInterface):
         
         self.parent = parent
         self.__filename = filename
-        self.filename = filename
+        self.update_filestamp(filename)
         self.code = None
         
         self.Bind(stc.EVT_STC_UPDATEUI, self.OnUpdate) # skip to brace matching
@@ -1543,10 +1544,14 @@ class Buffer(EditWindow, EditorInterface):
         if self.IndicatorValueAt(2, pos):
             p = self.IndicatorStart(2, pos)
             q = self.IndicatorEnd(2, pos)
-            text = self.GetTextRange(p, q).strip()
-            self.message("URL {!r}".format(text))
-            ## Note: Need a post-call of the confirmation dialog.
-            wx.CallAfter(self.parent.load_url, text)
+            url = self.GetTextRange(p, q).strip()
+            self.message("URL {!r}".format(url))
+            if wx.GetKeyState(wx.WXK_SHIFT):
+                ## Note: post-call for the confirmation dialog.
+                wx.CallAfter(self.parent.load_file, url)
+            else:
+                import webbrowser
+                return webbrowser.open(url)
         self.anchor = pos # Clear selection
     
     def on_modified(self, buf):
@@ -1590,15 +1595,15 @@ class Buffer(EditWindow, EditorInterface):
             self.Text = text
             self.EmptyUndoBuffer()
             self.SetSavePoint()
-            self.filename = filename
-            self.handler('buffer_loaded', self)
+        self.update_filestamp(filename)
+        self.handler('buffer_loaded', self)
     
     def _load_file(self, filename):
         """Wrapped method of LoadFile."""
         if self.LoadFile(filename):
+            self.update_filestamp(filename)
             self.EmptyUndoBuffer()
             self.SetSavePoint()
-            self.filename = filename
             self.handler('buffer_loaded', self)
             return True
         return False
@@ -1606,8 +1611,8 @@ class Buffer(EditWindow, EditorInterface):
     def _save_file(self, filename):
         """Wrapped method of SaveFile."""
         if self.SaveFile(filename):
+            self.update_filestamp(filename)
             self.SetSavePoint()
-            self.filename = filename
             self.handler('buffer_saved', self)
             return True
         return False
@@ -1769,8 +1774,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
               'buffer_modified' : [ None, dispatch ],
              'buffer_activated' : [ None, dispatch, self.on_activated ],
            'buffer_inactivated' : [ None, dispatch, self.on_inactivated ],
-         'buffer_caption_reset' : [ None, dispatch ],
-        'buffer_filename_reset' : [ None, dispatch ],
+       'buffer_caption_updated' : [ None, dispatch ],
              '*button* pressed' : [ None, dispatch, skip ],
             '*button* released' : [ None, dispatch, skip ],
             },
@@ -1962,6 +1966,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
     
     def load_file(self, filename, lineno=0, verbose=True):
         """Load a file into an existing or new buffer.
+        The requests module is required to use URL extension.
         """
         buf = self.find_buffer(filename)
         if not buf:
@@ -1979,8 +1984,6 @@ class EditorBook(AuiNotebook, CtrlInterface):
             self.swap_buffer(buf, lineno)
             return True
         try:
-            self.Freeze()
-            org = self.buffer
             if re.match(url_re, filename):
                 import requests
                 res = requests.get(filename, timeout=3.0)
@@ -1988,27 +1991,34 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     buf._load_textfile(res.text, filename)
                     self.swap_buffer(buf, lineno)
                     return True
-                return False
-            else:
-                if buf._load_file(filename):
-                    self.swap_buffer(buf, lineno)
-                    return True
-                return False
+                ## return False
+                raise Exception("The requested URL was not found.")
+            if buf._load_file(filename):
+                self.swap_buffer(buf, lineno)
+                return True
+            return False
         except Exception as e:
             self.post_message(f"Failed to load {filename!r}:", e)
             self.delete_buffer(buf)
-            if org:
-                self.swap_buffer(org)
             return False
-        finally:
-            self.Thaw()
     
-    def load_url(self, url):
-        if wx.GetKeyState(wx.WXK_SHIFT):
-            self.load_file(url)
-        else:
-            import webbrowser
-            webbrowser.open(url)
+    load_url = load_file # for backward compatibility
+    
+    def find_file(self, filename=None):
+        """Open the specified file."""
+        if not filename:
+            with wx.FileDialog(self, "Open buffer",
+                    wildcard='|'.join(self.wildcards),
+                    style=wx.FD_OPEN|wx.FD_MULTIPLE) as dlg:
+                if dlg.ShowModal() == wx.ID_OK:
+                    for fn in dlg.Paths:
+                        self.find_file(fn)
+            return
+        if not self.load_file(filename):
+            buf = self.create_buffer(filename)
+            self.swap_buffer(buf)
+    
+    open_buffer = find_file # for backward compatibility
     
     def save_file(self, filename, buf=None, verbose=True):
         """Save the current buffer to a file.
@@ -2075,16 +2085,6 @@ class EditorBook(AuiNotebook, CtrlInterface):
             if buf.need_buffer_save:
                 self.save_buffer(buf)
     
-    def open_buffer(self):
-        """Confirm the open with the dialog."""
-        with wx.FileDialog(self, "Open buffer",
-                wildcard='|'.join(self.wildcards),
-                style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST
-                                |wx.FD_MULTIPLE) as dlg:
-            if dlg.ShowModal() == wx.ID_OK:
-                for fn in dlg.Paths:
-                    self.load_file(fn)
-    
     def kill_buffer(self, buf=None):
         """Confirm the close with the dialog."""
         buf = buf or self.buffer
@@ -2884,7 +2884,7 @@ class Nautilus(Shell, EditorInterface):
         wx.CallAfter(_del)
     
     def on_activated(self, shell):
-        """Called when shell:self is activated.
+        """Called when the shell:self is activated.
         Reset localvars assigned for the shell target.
         """
         self.trace_position()

{mwxlib-0.94.7.dist-info → mwxlib-0.95.0.dist-info}/METADATA

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

{mwxlib-0.94.7.dist-info → mwxlib-0.95.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-mwx/__init__.py,sha256=zLsXDgqyC5NsPCjRxjS2huvZ3uDyeOJ1vapotqe2ULM,834
-mwx/bookshelf.py,sha256=UVVIwHaGO4aEHwZ8x5SKjpL-3MmQ1s6kkyuyRZqKWvU,5070
+mwx/__init__.py,sha256=2D6y5mnxxp5qNbBb0-Mng40JeUKCGbqohfcuHdihZx4,829
+mwx/bookshelf.py,sha256=U_UQUJkOqugAXYm2HpgqTIWPBREKLzJzRvJWCEWnT3c,5091
 mwx/controls.py,sha256=prp1NhZqv1XANhi2PPxW9jtrgwj_02XMOOyyzZ48klM,47185
-mwx/framework.py,sha256=9mvG3E0sx1gTuEcuz4RK4e3bhd4il_rduRrHkgJ9U4c,75109
+mwx/framework.py,sha256=9WFR5E68rqxFzRcyZ1SSzPGNw5LCexu6TuUeJ9DSKTE,75517
 mwx/graphman.py,sha256=9MG0BzQh5lDDadyPPXps2M0hf6mPN3G0MQbBGdplY_I,70027
 mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
 mwx/matplot2.py,sha256=qaF_gvLoLn-TimLbRR59KUavNr1ZpZQdSMqjzJk47rk,32682
 mwx/matplot2g.py,sha256=mDaD367wjq6xsyIDX9ot8jLwYYGayoavWMhqsQVBHac,65442
 mwx/matplot2lg.py,sha256=tg8u7w4DxiJdPN-E197NOmbQpc_1gZkgDHYv_xUhbFA,27224
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=c7VYeOmDSr1WcIzAjAIVmjTXBJqtxKzAz6EhZ9YmnAw,135633
+mwx/nutshell.py,sha256=4yFPmBfjUGyx9GGXEvKadWsPkIHwOloNp44UCGu7f9U,135788
 mwx/utilus.py,sha256=FTJhVFmx6TAE5rvZ_nfxZgyyaW4zMpXEz74v72X6m7Y,37399
 mwx/wxmon.py,sha256=Qk86VbuuW2rR46pqEYLur13G_aloWz5SVv6sib30YY0,12717
 mwx/wxpdb.py,sha256=2z3ZD9Oo1H-ONBHlaprkB9hrTmAI7o03sqO46ppEFE4,19129
@@ -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.94.7.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.94.7.dist-info/METADATA,sha256=_il1CbhksQkqZv4Gbmb_tr6DuQf8usLLIoGqXm1U6Ic,1925
-mwxlib-0.94.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mwxlib-0.94.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.94.7.dist-info/RECORD,,
+mwxlib-0.95.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.95.0.dist-info/METADATA,sha256=ybRT30kEPrD9gLt1a8MReKmNeSGbYiqLPfe3N79UABM,1925
+mwxlib-0.95.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mwxlib-0.95.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.95.0.dist-info/RECORD,,