mwxlib 0.90.1__py3-none-any.whl → 0.90.3__py3-none-any.whl

mwx/framework.py

@@ -4,7 +4,7 @@
 
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
-__version__ = "0.90.1"
+__version__ = "0.90.3"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -47,10 +47,6 @@ def postcall(f):
     return _f
 
 
-def skip(v):
-    v.Skip()
-
-
 _speckeys = {
     wx.WXK_ALT                  : 'alt',
     wx.WXK_BACK                 : 'backspace',
@@ -1146,7 +1142,9 @@ class ShellFrame(MiniFrame):
             evt.Skip()
         self.Bind(wx.EVT_SIZE, on_size)
         
-        def skip(v):
+        def dispatch(v):
+            """Fork key events to the debugger."""
+            self.debugger.handler(self.handler.current_event, v)
             if self.debugger.handler.current_state:
                 if self.debugger.tracing:
                     self.message("Current status is tracing. Press [C-g] to quit.")
@@ -1155,10 +1153,6 @@ class ShellFrame(MiniFrame):
                     self.indicator.Value = 7
             v.Skip()
         
-        def dispatch(v):
-            """Fork key events to the debugger."""
-            self.debugger.handler(self.handler.current_event, v)
-        
         self.handler.update({ # DNA<ShellFrame>
             None : {
                   'debug_begin' : [ None, self.on_debug_begin ],
@@ -1176,9 +1170,9 @@ class ShellFrame(MiniFrame):
          'buffer_caption_reset' : [ None, self.on_buffer_caption ],
             },
             0 : {
-                    '* pressed' : (0, skip, dispatch), # => debugger
-                   '* released' : (0, skip, dispatch), # => debugger
-                  'C-g pressed' : (0, self.Quit, skip, dispatch), # => debugger
+                    '* pressed' : (0, dispatch), # => debugger
+                   '* released' : (0, dispatch), # => debugger
+                  'C-g pressed' : (0, self.Quit, dispatch), # => debugger
                    'f1 pressed' : (0, self.About),
                   'C-f pressed' : (0, self.OnFindText),
                    'f3 pressed' : (0, self.OnFindNext),
@@ -1187,8 +1181,6 @@ class ShellFrame(MiniFrame):
                 '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")),
              '*f[0-9]* pressed' : (0, ),
-               'M-left pressed' : (0, _F(self.other_window, p=-1)),
-              'M-right pressed' : (0, _F(self.other_window, p=+1)),
             },
         })
         
@@ -1198,11 +1190,13 @@ class ShellFrame(MiniFrame):
         self.set_hookable(self.Scratch)
         
         @self.Scratch.define_key('C-j')
+        @postcall
         def eval_line():
             shell = self.current_shell
             self.Scratch.buffer.py_eval_line(shell.globals, shell.locals)
         
         @self.Scratch.define_key('M-j')
+        @postcall
         def exec_buffer():
             shell = self.current_shell
             self.Scratch.buffer.py_exec_region(shell.globals, shell.locals)
@@ -1739,7 +1733,6 @@ class ShellFrame(MiniFrame):
             self.debugger.editor = book
             self.debugger.watch((book.buffer.filename, line+1))
             self.debugger.send_input('') # clear input
-        book.buffer.del_marker(4)
     
     def stop_trace(self, line, book):
         if self.debugger.busy:
@@ -1747,7 +1740,6 @@ class ShellFrame(MiniFrame):
         if self.debugger.tracing:
             self.debugger.editor = None
             self.debugger.unwatch()
-        book.buffer.set_marker(line, 4)
     
     def on_trace_begin(self, frame):
         """Called when set-trace."""
@@ -1810,20 +1802,6 @@ class ShellFrame(MiniFrame):
         self.popup_window(self.Help, focus=0)
         self.Help.swap_page(buf)
     
-    def other_window(self, p=1):
-        "Move focus to other window"
-        pages = [x for x in self.get_all_pages() if x.IsShownOnScreen()]
-        wnd = wx.Window.FindFocus()
-        while wnd:
-            if wnd in pages:
-                j = (pages.index(wnd) + p) % len(pages)
-                obj = pages[j]
-                if isinstance(obj, aui.AuiNotebook):
-                    obj = obj.CurrentPage
-                obj.SetFocus()
-                break
-            wnd = wnd.Parent
-    
     def clone_shell(self, target):
         if not hasattr(target, '__dict__'):
             raise TypeError("primitive objects cannot be targeted")

mwx/nutshell.py

@@ -7,6 +7,7 @@ Author: Kazuya O'moto <komoto@jeol.co.jp>
 from functools import wraps
 from importlib import import_module
 from pprint import pformat
+from bdb import BdbQuit
 import traceback
 import warnings
 import inspect
@@ -35,14 +36,19 @@ from .framework import CtrlInterface, AuiNotebook, Menu
 ## URL pattern (flag = re.M | re.A)
 url_re = r"https?://[\w/:%#$&?()~.=+-]+"
 
+## no-file pattern
+nofile_re = r'[\/:*?"<>|]'
+
 ## Python syntax pattern
 py_indent_re  = r"if|else|elif|for|while|with|def|class|try|except|finally"
 py_outdent_re = r"else:|elif\s+.*:|except(\s+.*)?:|finally:"
 py_closing_re = r"break|pass|return|raise|continue"
 
 ## Python interp traceback pattern
-py_error_re = r'^ +File "(.*?)", line ([0-9]+)'
-py_frame_re = r"^ +file '(.*?)', line ([0-9]+)"
+py_error_re = r' +File "(.*?)", line ([0-9]+)'
+py_frame_re = r" +file '(.*?)', line ([0-9]+)"
+py_where_re = r'> +([^*?"<>|\r\n]+?):([0-9]+)'
+py_break_re = r'at ([^*?"<>|\r\n]+?):([0-9]+)'
 
 
 def skip(v):
@@ -111,7 +117,7 @@ class EditorInterface(CtrlInterface):
                   'C-t pressed' : (0, ),                  # overrides transpose-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)),
+              'S-space pressed' : (0, _F(self.set_pointer)),
           'C-backspace pressed' : (0, skip),
           'S-backspace pressed' : (0, _F(self.backward_kill_line)),
                 'C-tab pressed' : (0, _F(self.insert_space_like_tab)),
@@ -376,6 +382,11 @@ class EditorInterface(CtrlInterface):
         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]
+    
     @property
     def markline(self):
         return self.MarkerNext(0, 1<<0)
@@ -416,9 +427,10 @@ class EditorInterface(CtrlInterface):
     
     def set_pointer(self):
         if self.pointer == self.cline:
-            self.pointer = -1 # toggle marker
+            self.pointer = -1
         else:
             self.pointer = self.cline
+            self.red_pointer = -1
     
     def exchange_point_and_mark(self):
         p = self.cpos
@@ -1607,7 +1619,7 @@ class Buffer(EditWindow, EditorInterface):
     ## Python eval / exec
     ## --------------------------------
     
-    def py_eval_line(self, globals, locals):
+    def py_eval_line(self, globals=None, locals=None):
         if self.CallTipActive():
             self.CallTipCancel()
         
@@ -1631,7 +1643,7 @@ class Buffer(EditWindow, EditorInterface):
                 return
         self.message(status)
     
-    def py_exec_region(self, globals, locals, filename=None):
+    def py_exec_region(self, globals=None, locals=None, filename=None):
         if not filename:
             filename = self.filename
         try:
@@ -1639,6 +1651,9 @@ class Buffer(EditWindow, EditorInterface):
             exec(code, globals, locals)
             dispatcher.send(signal='Interpreter.push',
                             sender=self, command=None, more=False)
+        except BdbQuit:
+            self.red_pointer = self.cline
+            pass
         except Exception as e:
             msg = traceback.format_exc()
             err = re.findall(py_error_re, msg, re.M)
@@ -1651,7 +1666,7 @@ class Buffer(EditWindow, EditorInterface):
                 self.EnsureCaretVisible()
                 self.AnnotationSetStyle(lx, stc.STC_STYLE_ANNOTATION)
                 self.AnnotationSetText(lx, msg)
-            self.message("- {!r}".format(e))
+            self.message("- {}".format(e))
             ## print(msg, file=sys.__stderr__)
         else:
             self.code = code
@@ -2261,7 +2276,7 @@ class Nautilus(Shell, EditorInterface):
             obj.this = inspect.getmodule(obj)
             obj.shell = self # overwrite the facade <wx.py.shell.ShellFacade>
         except AttributeError:
-            ## print("- cannot overwrite target vars: {!r}".format(e))
+            ## print("- cannot overwrite target vars: {}".format(e))
             pass
         self.parent.handler('title_window', obj)
     
@@ -2714,6 +2729,7 @@ class Nautilus(Shell, EditorInterface):
             self.goto_char(self.eolc)
             self.promptPosEnd = 0
             self.prompt()
+        self.AnnotationClearAll()
     
     def on_enter_notemode(self, evt):
         self.noteMode = True
@@ -3262,7 +3278,7 @@ class Nautilus(Shell, EditorInterface):
                 if lines:
                     region = self.get_region(self.cline)
                     self.pointer = region[0] + lines[-1] - 1
-                self.message("- {!r}".format(e))
+                self.message("- {}".format(e))
                 ## print(msg, file=sys.__stderr__)
             else:
                 del self.pointer

mwx/wxmon.py

@@ -53,10 +53,10 @@ class EventMonitor(CheckList, ListCtrlAutoWidthMixin, CtrlInterface):
         
         self.parent = parent
         self.target = None
+        self._target = None # previous target
         
         self.Font = wx.Font(9, wx.DEFAULT, wx.NORMAL, wx.NORMAL)
         
-        self.__prev = None
         self.__dir = True # sort direction
         self.__items = []
         
@@ -128,13 +128,14 @@ class EventMonitor(CheckList, ListCtrlAutoWidthMixin, CtrlInterface):
         self.clear()
         self.unwatch()
         if widget is None:
-            widget = self.__prev # Restart
+            widget = self._target # Resume watching the previous target.
         if not widget:
             return
         if not isinstance(widget, wx.Object):
             wx.MessageBox("Cannot watch the widget.\n\n"
                           "- {!r} is not a wx.Object.".format(widget))
             return
+        self._target = widget
         self.target = widget
         ssmap = self.dump(widget, verbose=0)
         for binder in self.get_watchlist():
@@ -158,7 +159,6 @@ class EventMonitor(CheckList, ListCtrlAutoWidthMixin, CtrlInterface):
             if not widget.Unbind(binder, handler=self.onWatchedEvent):
                 print("- Failed to unbind {}: {}".format(binder.typeId, widget))
         self.parent.handler('monitor_end', widget)
-        self.__prev = widget
         self.target = None
     
     def onWatchedEvent(self, evt):
@@ -297,7 +297,7 @@ class EventMonitor(CheckList, ListCtrlAutoWidthMixin, CtrlInterface):
     
     def OnContextMenu(self, evt):
         obj = self.target
-        wnd = self.__prev
+        wnd = self._target
         menu = [
             (1, "Copy data", Icon('copy'),
                 lambda v: self.copy(),

mwx/wxpdb.py

@@ -370,7 +370,7 @@ class Debugger(Pdb):
         """
         if self.editor:
             del self.editor.buffer.pointer
-            self.editor = None
+        self.editor = None
         self.code = None
         
         ## Note: Required to terminate the reader of threading pdb.

mwx/wxwit.py

@@ -134,14 +134,6 @@ class Inspector(it.InspectionTree, CtrlInterface):
         self.target = None
         self.timer.Stop()
     
-    def addref(self, obj, ref='obj'):
-        shell = self.parent.current_shell
-        if shell is not obj:
-            shell.locals[ref] = obj
-            self.parent.message("self.{} -> {!r}".format(ref, obj))
-        shell.SetFocus()
-        return shell
-    
     ## --------------------------------
     ## Actions on tree items
     ## --------------------------------
@@ -177,16 +169,13 @@ class Inspector(it.InspectionTree, CtrlInterface):
         valid = (obj is not None)
         menu = [
             (1, "&Dive into the shell", Icon('core'),
-                lambda v: self.parent.clone_shell(obj),
+                lambda v: dive(obj),
                 lambda v: v.Enable(valid)),
                 
             (2, "&Watch the event", Icon('ghost'),
-                lambda v: self.parent.debug(obj),
+                lambda v: debug(obj),
                 lambda v: v.Enable(valid)),
                 
-            (3, "&Add reference", Icon('tag'),
-                lambda v: self.addref(obj),
-                lambda v: v.Enable(valid)),
             (),
             (8, "&Filling View", miniIcon('ShowFilling'),
                 lambda v: filling(obj),

{mwxlib-0.90.1.dist-info → mwxlib-0.90.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.90.1
+Version: 0.90.3
 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.90.1.dist-info → mwxlib-0.90.3.dist-info}/RECORD

@@ -1,22 +1,22 @@
 mwx/__init__.py,sha256=6pnXWrbO-_yuceMClYg0GKpZB5W1DPUPerhjUm4bIXM,2423
 mwx/controls.py,sha256=6Zin21RWN_yQ7v8FQQjksvJux7Bbi8opMFq1HsbZCVo,46530
-mwx/framework.py,sha256=k8wBHdXU6_ixMyK_BKkmD6HFTF3MK4srHHlW8HUF80Q,73430
+mwx/framework.py,sha256=qbF1XwgBkNWT5z8Hbu3IKdvUnDpMZYzxwshZ9r6vctU,72662
 mwx/graphman.py,sha256=agvuPofnfQoDtTC0Hk_n8OqySb0SqeHoJVMcLi_YVQA,68507
 mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
 mwx/matplot2.py,sha256=Knecx055Cm25qobhXuNTE1sjDVLABl6IGVAYFAwfyEI,32882
 mwx/matplot2g.py,sha256=mLy73uchAFkD5SBeeGo_ZI9O5vuhyQei4vqZteEclG4,64959
 mwx/matplot2lg.py,sha256=Djt0lFtQs_yLK4wOYXLhLsSahgVhCGtYlIIQ8IJkCOA,26311
 mwx/mgplt.py,sha256=EG5yP2vibFkksiuGrQy_nqRepwtFKk2xg35HbbNz0E0,5742
-mwx/nutshell.py,sha256=lgEBUeqBnYWBUUHzKu1CkXY6ckUSDgtHnhAoBYjrYgs,135204
+mwx/nutshell.py,sha256=seOjkLmsfsGRCOrWzOH-fEST8F_SJeC6tp4xNpcaJkM,135740
 mwx/utilus.py,sha256=YA19NZjCrTHHafqd2sQoA-TV947awCxPPmDLiHSz978,37001
-mwx/wxmon.py,sha256=FpuFpARJ055OUWRu18TCESqjV9TfieqT3t_A-kQyAzI,13751
-mwx/wxpdb.py,sha256=KQkmFdF-WB4NwQuK5bWY9wzuSffNwDSxtdzqlEq2054,19490
+mwx/wxmon.py,sha256=6ejFMuI7gffewrR7eLbI7BQfqBRYX-ujp2Ru7ofeork,13802
+mwx/wxpdb.py,sha256=8f55jAO856iB61wRidCR3aFjnrHuaC3RZF6kwj1Ok1E,19486
 mwx/wxwil.py,sha256=uAmpkOQtDGjqywJ8bV-yT5IUANPi9rsMa1CcWVIILeM,5680
-mwx/wxwit.py,sha256=BJTnqdoLpWYHQAiUfhzxhF6Nip6Eo-8QoVr3DwtAC3k,8097
+mwx/wxwit.py,sha256=0sskPOE9LTIYI0iokXTmtgPMDxeLAZk3zoFMDH9Xn5g,7656
 mwx/py/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mwx/py/filling.py,sha256=f6KMBcBv7gwrl6qmJYLTL-O0Z47bWNAdTCZtUZIo8vM,16794
-mwxlib-0.90.1.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.90.1.dist-info/METADATA,sha256=7y59AKjewO9YpQgP8yEs4i_HHKldXUHNVKVPB41vQW0,1945
-mwxlib-0.90.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-mwxlib-0.90.1.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.90.1.dist-info/RECORD,,
+mwxlib-0.90.3.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.90.3.dist-info/METADATA,sha256=CEHM1YIueh8YkeDoP2Ype1-QD9DDtgqUGxQFHKMzSj8,1945
+mwxlib-0.90.3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+mwxlib-0.90.3.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.90.3.dist-info/RECORD,,