mwxlib 0.80.0__py3-none-any.whl → 0.80.2__py3-none-any.whl

mwx/framework.py

@@ -4,7 +4,7 @@
 
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
-__version__ = "0.80.0"
+__version__ = "0.80.2"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -1204,7 +1204,7 @@ class ShellFrame(MiniFrame):
             for buf in book.all_buffers:
                 if book.need_buffer_save_p(buf):
                     self.popup_window(book)
-                    book.swap_buffer(buf)
+                    buf.SetFocus()
                     if wx.MessageBox(
                             "You are closing unsaved content.\n\n"
                             "Changes to the content will be discarded.\n"
@@ -1324,12 +1324,12 @@ class ShellFrame(MiniFrame):
             if x > 2*w or y > h:
                 pane.floating_pos = wx.GetMousePosition()
         
+        if wnd and win.IsShown(): # restore focus
+            wnd.SetFocus()
+        
         nb.Show(show)
         pane.Show(show)
         self._mgr.Update()
-        
-        if wnd and win.IsShown(): # restore focus
-            wnd.SetFocus()
     
     ## --------------------------------
     ## Actions for handler
@@ -1352,13 +1352,11 @@ class ShellFrame(MiniFrame):
         self.message("Quit")
         evt.Skip()
     
-    def load(self, obj, show=True, focus=False):
+    def load(self, obj, focus=False):
         """Load file @where the object is defined.
         
         Args:
             obj     : target object.
-            show    : Popup window when success.
-                      The window will not be hidden even if no show.
             focus   : Set the focus if the window is displayed.
         """
         if not isinstance(obj, str):
@@ -1384,16 +1382,11 @@ class ShellFrame(MiniFrame):
         
         wnd = wx.Window.FindFocus() # original focus
         try:
-            if show:
-                self.popup_window(book, show, focus)
+            self.popup_window(book, focus=focus)
             if buf and book.need_buffer_save_p(buf): # exists and need save?
-                book.swap_buffer(buf)
-                if not book.load_buffer(): # confirm
-                    return None
-            if not book.load_file(filename, lineno, show):
-                book.remove_buffer()
-                return False
-            return True
+                buf.SetFocus()
+                return book.load_buffer()
+            return book.load_file(filename, lineno)
         finally:
             if not focus:
                 wx.CallAfter(wnd.SetFocus) # restore focus with delay
@@ -1431,6 +1424,19 @@ class ShellFrame(MiniFrame):
                 self.debugger.debug(obj, *args, **kwargs)
             finally:
                 self.debugger.interactive_shell = shell
+        elif isinstance(obj, str):
+            try:
+                shell = self.debugger.interactive_shell
+                self.debugger.interactive_shell = self.current_shell
+                self.debugger.editor = self.Log # set default logger
+                filename = "<string>"
+                buf = self.Log.find_buffer(filename)\
+                  or self.Log.create_new_buffer(filename)
+                with buf.off_readonly():
+                    buf.Text = obj
+                self.debugger.run(obj)
+            finally:
+                self.debugger.interactive_shell = shell
         elif hasattr(obj, '__dict__'):
             self.message("Building locals info list...")
             self.linfo.watch(obj.__dict__)

mwx/graphman.py

@@ -1088,7 +1088,8 @@ class Frame(mwx.Frame):
             floating_pos : posision of floating window
             floating_size : size of floating window
         
-        retval -> None if succeeded else False
+        Returns:
+            None if succeeded else False
         
         Note:
             The root module must have a class `Plugin` <mwx.graphman.Layer>

mwx/nutshell.py

@@ -1795,7 +1795,7 @@ class EditorBook(aui.AuiNotebook, CtrlInterface):
         """Yields context menu."""
         def _menu(j, buf):
             return (j, str(buf), '', wx.ITEM_CHECK,
-                lambda v: self.swap_buffer(buf).SetFocus(),
+                lambda v: buf.SetFocus(),
                 lambda v: v.Check(buf is self.buffer))
         
         return (_menu(j+1, x) for j, x in enumerate(self.all_buffers))
@@ -1818,16 +1818,17 @@ class EditorBook(aui.AuiNotebook, CtrlInterface):
     
     def swap_buffer(self, buf):
         """Replace buffer with specified buffer."""
-        if buf:
+        j = self.GetPageIndex(buf)
+        if j != -1:
             wnd = wx.Window.FindFocus() # original focus
-            j = self.GetPageIndex(buf)
             if j != self.Selection:
                 self.Selection = j # the focus is moved
             if wnd and wnd not in self.all_buffers: # restore focus other window
                 wnd.SetFocus()
-        return buf
+            return buf
     
     def create_new_buffer(self, filename, index=None):
+        """Create a new buffer (internal use only)."""
         try:
             self.Freeze()
             buf = Buffer(self, filename)
@@ -1841,6 +1842,7 @@ class EditorBook(aui.AuiNotebook, CtrlInterface):
             self.Thaw()
     
     def new_buffer(self):
+        """Create a new default buffer."""
         buf = self.default_buffer
         if not buf or buf.mtdelta is not None: # is saved?
             buf = self.create_new_buffer(self.default_name, index=0)
@@ -1856,7 +1858,7 @@ class EditorBook(aui.AuiNotebook, CtrlInterface):
         if not buf:
             buf = self.buffer
         j = self.GetPageIndex(buf)
-        self.DeletePage(j)
+        self.DeletePage(j) # the focus is moved
         
         if not self.buffer: # no buffers:
             self.new_buffer()
@@ -1884,7 +1886,7 @@ class EditorBook(aui.AuiNotebook, CtrlInterface):
         """Returns whether the buffer should be saved."""
         return buf.mtdelta is not None and buf.IsModified()
     
-    def load_cache(self, filename, lineno=0, globals=None, focus=False):
+    def load_cache(self, filename, lineno=0, globals=None):
         """Load a file from cache.
         Note:
             The filename should be an absolute path.
@@ -1892,13 +1894,11 @@ class EditorBook(aui.AuiNotebook, CtrlInterface):
         """
         buf = self.find_buffer(filename) or self.create_new_buffer(filename)
         if buf._load_cache(filename, lineno, globals):
-            self.swap_buffer(buf)
-            if focus:
-                buf.SetFocus()
+            buf.SetFocus()
             return True
         return False
     
-    def load_file(self, filename, lineno=0, focus=False):
+    def load_file(self, filename, lineno=0):
         """Load a file into an existing or new buffer.
         """
         buf = self.find_buffer(filename) or self.create_new_buffer(filename)
@@ -1913,16 +1913,16 @@ class EditorBook(aui.AuiNotebook, CtrlInterface):
                 return None
         try:
             self.Freeze()
-            self.swap_buffer(buf)
-            if focus:
+            org = self.buffer
+            if buf._load_file(buf.filename, lineno):
                 buf.SetFocus()
-            return buf._load_file(buf.filename, lineno)
-        except (FileNotFoundError, OSError) as e:
-            self.post_message("Failed to load {!r}: {}".format(buf.name, e))
-            pass
+                return True
+            return False
         except Exception as e:
             self.post_message("Failed to load {!r}: {}".format(buf.name, e))
             self.remove_buffer(buf)
+            self.swap_buffer(org)
+            return False
         finally:
             self.Thaw()
     
@@ -1943,6 +1943,7 @@ class EditorBook(aui.AuiNotebook, CtrlInterface):
             return buf._save_file(filename)
         except Exception as e:
             self.post_message("Failed to save {!r}: {}".format(buf.name, e))
+            return False
     
     def load_buffer(self):
         """Confirm the load with the dialog."""
@@ -1983,6 +1984,7 @@ class EditorBook(aui.AuiNotebook, CtrlInterface):
     def save_all_buffers(self):
         for buf in filter(self.need_buffer_save_p, self.all_buffers):
             self.swap_buffer(buf)
+            assert buf is self.buffer
             self.save_buffer()
         return True
     
@@ -2015,7 +2017,7 @@ class EditorBook(aui.AuiNotebook, CtrlInterface):
     
     def kill_all_buffers(self):
         for buf in filter(self.need_buffer_save_p, self.all_buffers):
-            self.swap_buffer(buf)
+            buf.SetFocus()
             if wx.MessageBox(
                     "You are closing unsaved content.\n\n"
                     "Changes to the content will be discarded.\n"
@@ -2698,8 +2700,8 @@ class Nautilus(Shell, EditorInterface):
         
             - quoteback : x`y --> y=x
             - pullback  : x@y --> y(x)
-            - partial   : x@(y1,...,yn) --> partial(y1,...,yn)(x)
-            - apropos   : x.y?p --> apropos(x,y,...,p)
+            - partial   : x@(y1,,,yn) --> partial(y1,,,yn)(x)
+            - apropos   : x.y?p --> apropos(x,y,,,p)
         
         Note:
             This is called before run, execute, and original magic.
@@ -2725,22 +2727,26 @@ class Nautilus(Shell, EditorInterface):
                 pass
             
             elif c == '@':
-                f = "{rhs}({lhs})"
                 lhs = lhs.strip() or '_'
                 rhs = _eats(rest, sep2).strip()
+                
                 if rhs in ("debug", "profile", "timeit"):
                     ## func(a,b,c) @debug --> func,a,b,c @debug
-                    lhs = re.sub(r"([\w.]+)\((.*)\)", r"\1, \2", lhs, flags=re.S)
-                else:
+                    lhs = re.sub(r"(.*[\w\)\]])\s*\((.*)\)$",
+                                 r"\1, \2", lhs, flags=re.S)
+                    ## obj[...] @debug --> obj.__getitem__, (...) @debug
+                    lhs = re.sub(r"(.*[\w\)\]])\s*\[(.*)\]$",
+                                 r"\1.__getitem__, (\2)", lhs, flags=re.S)
+                elif rhs.startswith('('):
                     ## @(y1,,,yn) --> partial(y1,,,yn)
                     rhs = re.sub(r"^\((.*)\)", r"partial(\1)", rhs, flags=re.S)
-                return self.magic_interpret([f.format(lhs=lhs, rhs=rhs)] + rest)
+                
+                return self.magic_interpret([f"{rhs}({lhs})"] + rest)
             
             if c == '`':
-                f = "{rhs} = {lhs}"
                 lhs = lhs.strip() or '_'
                 rhs = _eats(rest, sep1).strip()
-                return self.magic_interpret([f.format(lhs=lhs, rhs=rhs)] + rest)
+                return self.magic_interpret([f"{rhs} = {lhs}"] + rest)
             
             if c == '?':
                 head, sep, hint = lhs.rpartition('.')

mwx/wxpdb.py

@@ -235,6 +235,8 @@ class Debugger(Pdb):
                 self.handler('abort')
     
     def debug(self, obj, *args, **kwargs):
+        """Debug a callable object.
+        """
         if not callable(obj):
             wx.MessageBox("Not a callable object.\n\n"
                           "Unable to debug {!r}.".format(obj))
@@ -258,6 +260,31 @@ class Debugger(Pdb):
             self.set_quit()
             return
     
+    def run(self, cmd):
+        """Debug a statement executed via the exec() function.
+        """
+        if self.busy:
+            wx.MessageBox("Debugger is running.\n\n"
+                          "Enter [q]uit to exit debug mode.")
+            return
+        self.unwatch()
+        globals = self.interactive_shell.globals
+        locals = self.interactive_shell.locals
+        if isinstance(cmd, str):
+            cmd = compile(cmd, "<string>", "exec")
+        try:
+            frame = inspect.currentframe().f_back
+            self.set_trace(frame)
+            exec(cmd, globals, locals)
+        except BdbQuit:
+            pass
+        except Exception as e:
+            ## Note: CallAfter to avoid crashing by a kill-focus event.
+            wx.CallAfter(wx.MessageBox,
+                         "Debugger is closed.\n\n{}".format(e))
+        finally:
+            self.set_quit()
+    
     ## --------------------------------
     ## Actions for handler
     ## --------------------------------
@@ -269,7 +296,10 @@ class Debugger(Pdb):
         for editor in self.parent.get_pages(type(self.editor)):
             buf = editor.find_buffer(f)
             if buf:
-                editor.swap_buffer(buf)
+                wnd = wx.Window.FindFocus()
+                buf.SetFocus()
+                if wnd is self.interactive_shell:
+                    wnd.SetFocus()
                 return editor
     
     def on_debug_begin(self, frame):

{mwxlib-0.80.0.dist-info → mwxlib-0.80.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.80.0
+Version: 0.80.2
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto <komoto@jeol.co.jp>

{mwxlib-0.80.0.dist-info → mwxlib-0.80.2.dist-info}/RECORD

@@ -1,22 +1,22 @@
 mwx/__init__.py,sha256=CxhKHOhig62F8p6GvP5gii-VvQtSjp9yWJpHvC_Kans,2592
 mwx/controls.py,sha256=d5ZRw21nXxV06QHV5Y9t85Lqm3pLZRoPS27YknC_H54,42455
-mwx/framework.py,sha256=m4iGorLqvdUnsr_6aP3uECEMe55WXAcc5vZY2EdRL98,69041
-mwx/graphman.py,sha256=M5hUEW4hZDlXTOvROab2te68HWb6OVgxakz8Z4iEEy0,69214
+mwx/framework.py,sha256=3wkSURTcq751o30D5nq2OSHnM08Ng4uwUnANVzRVxs4,69327
+mwx/graphman.py,sha256=2_0vEJB2hbIzeILufty6Dc_sCRg_3Abc0ZhXrfCkuo4,69226
 mwx/images.py,sha256=9e8X7OpJ6Z3fF3ez17P_qk2D1NMO10-lN8TCtulAqT0,46248
 mwx/matplot2.py,sha256=OnG33VYvNY9tPbTiUdhM1bibnMwx8Z91hq2Wv7az78s,36000
 mwx/matplot2g.py,sha256=yfF4r6juclU1I1k41lGb_VwxRmp0ktuD8az-wQ26MsE,67727
 mwx/matplot2lg.py,sha256=Dnz_U7K_QkPmsJd18WzZ6PkaTOtWu_IwOgkfEdJv4d0,27606
 mwx/mgplt.py,sha256=49_wpFZUEKErQmtobqrlNKDjWlAsdLft-izlqSyGPD0,6878
-mwx/nutshell.py,sha256=EO4s_67Dk4EiI7h-3vHOzWyI9WnaXl4QQmsVkF7s5Xk,133557
+mwx/nutshell.py,sha256=qhgrxO6UpOgxODtG1nppbrZWNFsd9Mg4Y6a0EWl5Xas,133784
 mwx/utilus.py,sha256=3VaUX_hclVLYixOyDC-4gxxug9_4kMzCTQcDuHs3REA,34863
 mwx/wxmon.py,sha256=Odmh13Ek4oJo9V5uFCTemoWlsPyZt4ITTmYZiKl_BKI,11405
-mwx/wxpdb.py,sha256=WweNxRCaJa3DAO8mkpU57sluTk4oxBEZm44AVBR4vSI,18700
+mwx/wxpdb.py,sha256=-_rDNxk3S3z1PgDZ6AAhKksFp8wJL3NBKDxfOZ74E3c,19790
 mwx/wxwil.py,sha256=BUfEF0Nc1E-mVC3Vdz6k1E-2s5J0PO6qEzRQ6lfyePI,5246
 mwx/wxwit.py,sha256=M_jRGJOZge2B4Cq1OsAHqnGjeg56UI-v1BolDybPR-o,7246
 mwx/py/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mwx/py/filling.py,sha256=NnQnfUVol-Nz4QYZUKFIyRX-Yxp54m5n54Yxza3Iwho,16655
-mwxlib-0.80.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.80.0.dist-info/METADATA,sha256=8cua-4t5PPXlX-lsmZ587VDduSYK6DdMSieqonWiLQg,1995
-mwxlib-0.80.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-mwxlib-0.80.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.80.0.dist-info/RECORD,,
+mwxlib-0.80.2.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.80.2.dist-info/METADATA,sha256=TEZNsDZwMDlNd_kSeAUCSHbNdKm0rY_kVAP8kW9dghM,1995
+mwxlib-0.80.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+mwxlib-0.80.2.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.80.2.dist-info/RECORD,,