mwxlib 0.80.1__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.1"
+__version__ = "0.80.2"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -1424,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/nutshell.py

@@ -2700,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.
@@ -2727,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
     ## --------------------------------

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.80.1
+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.1.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=CZlL9TYgWOFh5pOgxm5sxZPpMkzuiQPvnmu0zckoUmA,68726
+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=D1gM4bivte8GWgpOhXvSZwd6ZUVucsAU_tQfCu0laL8,133573
+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=FoEgaSeKnKz3JHYnpddMpPelazXIbuvV15XVkBZ6c8k,18823
+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.1.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.80.1.dist-info/METADATA,sha256=YXvrpndDe6OyVAnL5iCbeoahNVq1yZXwNkretd8OTco,1995
-mwxlib-0.80.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-mwxlib-0.80.1.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.80.1.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,,