mwxlib 0.83.6__py3-none-any.whl → 0.83.8__py3-none-any.whl

mwx/framework.py

@@ -4,7 +4,7 @@
 
 Author: Kazuya O'moto <komoto@jeol.co.jp>
 """
-__version__ = "0.83.6"
+__version__ = "0.83.8"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -1183,7 +1183,7 @@ class ShellFrame(MiniFrame):
         
         if flush:
             for book in self.get_all_pages(type(self.Log)):
-                book.remove_all_buffers()
+                book.delete_all_buffers()
         
         self.SESSION_FILE = os.path.abspath(rc)
         try:

mwx/nutshell.py

@@ -34,6 +34,19 @@ from .utilus import find_modules, deprecated
 from .framework import CtrlInterface, AuiNotebook, Menu
 
 
+## URL pattern (flag = re.M | re.A)
+url_re = r"https?://[\w/:%#\$&\?()~.=+-]+"
+
+## 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"^\s+File \"(.*?)\", line ([0-9]+)"
+py_frame_re = r"^\s+file \'(.*?)\', line ([0-9]+)"
+
+
 def skip(v):
     v.Skip()
 
@@ -278,6 +291,11 @@ class EditorInterface(CtrlInterface):
         ## Custom indicator [2] for match_paren
         self.IndicatorSetStyle(2, stc.STC_INDIC_DOTS)
         self.IndicatorSetForeground(2, "light gray")
+        try:
+            self.IndicatorSetHoverStyle(2, stc.STC_INDIC_PLAIN)
+            self.IndicatorSetHoverForeground(2, "light gray")
+        except AttributeError:
+            pass
         
         ## Custom annotation
         self.AnnotationSetVisible(stc.STC_ANNOTATION_BOXED)
@@ -585,10 +603,6 @@ class EditorInterface(CtrlInterface):
     ## --------------------------------
     ## Python syntax and indentation
     ## --------------------------------
-    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"
-    
     def on_indent_line(self, evt):
         if self.SelectedText:
             evt.Skip()
@@ -629,7 +643,7 @@ class EditorInterface(CtrlInterface):
         indent = self.py_calc_indentation(text) # check previous line
         text = self.GetLine(self.cline)
         lstr, _indent = self.py_strip_indents(text) # check current line
-        if re.match(self.py_outdent_re, lstr):
+        if re.match(py_outdent_re, lstr):
             indent -= 4
         return indent
     
@@ -646,9 +660,9 @@ class EditorInterface(CtrlInterface):
         text = text.rstrip()
         if text.endswith('\\'):
             return indent + 2
-        if text.endswith(':') and re.match(self.py_indent_re, lstr):
+        if text.endswith(':') and re.match(py_indent_re, lstr):
             return indent + 4
-        if re.match(self.py_closing_re, lstr):
+        if re.match(py_closing_re, lstr):
             return indent - 4
         return indent
     
@@ -852,11 +866,6 @@ class EditorInterface(CtrlInterface):
         if item:
             self.IndicatorSetForeground(0, item.get('fore') or "red")
             self.IndicatorSetForeground(1, item.get('back') or "yellow")
-            try:
-                self.IndicatorSetHoverStyle(1, stc.STC_INDIC_ROUNDBOX)
-                self.IndicatorSetHoverForeground(1, "blue")
-            except AttributeError:
-                pass
         
         ## Apply the rest of the style
         for key, value in spec.items():
@@ -1019,9 +1028,9 @@ class EditorInterface(CtrlInterface):
                 p -= 1
         return p, q, st
     
-    def grep_forward(self, pattern):
+    def grep_forward(self, pattern, flags=re.M):
         text = self.GetTextRange(self.eol, self.TextLength)
-        errs = re.finditer(pattern, text, re.M)
+        errs = re.finditer(pattern, text, flags)
         for err in errs:
             p, q = err.span()
             self.goto_char(q + self.eol)
@@ -1030,9 +1039,9 @@ class EditorInterface(CtrlInterface):
             self.EnsureVisible(self.cline)
             yield err
     
-    def grep_barckward(self, pattern):
+    def grep_barckward(self, pattern, flags=re.M):
         text = self.GetTextRange(0, self.cpos)
-        errs = re.finditer(pattern, text, re.M)
+        errs = re.finditer(pattern, text, flags)
         for err in reversed(list(errs)):
             p, q = err.span()
             self.goto_char(p)
@@ -1041,6 +1050,10 @@ class EditorInterface(CtrlInterface):
             self.EnsureVisible(self.cline)
             yield err
     
+    def grep(self, pattern, flags=re.M):
+        text = self.GetTextRange(0, self.TextLength)
+        yield from re.finditer(pattern, text, flags)
+    
     def search_text(self, text):
         """Yields raw-positions where `text` is found."""
         word = text.encode()
@@ -1441,7 +1454,7 @@ class Buffer(EditWindow, EditorInterface):
         f = self.filename
         if f and os.path.isfile(f):
             return os.path.getmtime(f) - self.__mtime
-        elif f and re.match(r"https?://[\w/:%#\$&\?()~.=+-]+", f):
+        elif f and re.match(url_re, f):
             return -1
     
     @property
@@ -1493,6 +1506,8 @@ class Buffer(EditWindow, EditorInterface):
         
         self.Bind(stc.EVT_STC_UPDATEUI, self.OnUpdate) # skip to brace matching
         
+        self.Bind(stc.EVT_STC_INDICATOR_CLICK, self.OnIndicatorClick)
+        
         self.Bind(stc.EVT_STC_SAVEPOINTLEFT, self.OnSavePointLeft)
         self.Bind(stc.EVT_STC_SAVEPOINTREACHED, self.OnSavePointReached)
         
@@ -1512,12 +1527,12 @@ class Buffer(EditWindow, EditorInterface):
         
         self.handler.update({ # DNA<Buffer>
             None : {
-                  'stc_updated' : [ None, ],
-                 'buffer_saved' : [ None, self.on_activated, dispatch ],
-                'buffer_loaded' : [ None, self.on_activated, dispatch ],
+                 'buffer_saved' : [ None, dispatch ],
+                'buffer_loaded' : [ None, dispatch ],
+              'buffer_modified' : [ None, self.on_modified, dispatch ],
              'buffer_activated' : [ None, self.on_activated, dispatch ],
            'buffer_inactivated' : [ None, self.on_inactivated, dispatch ],
-           'py_region_executed' : [ None, self.on_activated ],
+       'buffer_region_executed' : [ None, ],
             },
             -1 : { # original action of the EditWindow
                     '* pressed' : (0, skip, self.on_exit_escmap),
@@ -1548,9 +1563,30 @@ class Buffer(EditWindow, EditorInterface):
     def OnUpdate(self, evt): #<wx._stc.StyledTextEvent>
         if evt.Updated & (stc.STC_UPDATE_SELECTION | stc.STC_UPDATE_CONTENT):
             self.trace_position()
-            self.handler('stc_updated', evt)
+            if evt.Updated & stc.STC_UPDATE_CONTENT:
+                self.handler('buffer_modified', self)
         evt.Skip()
     
+    def OnIndicatorClick(self, evt):
+        if self.SelectedText:
+            evt.Skip()
+            return
+        pos = evt.Position
+        if self.IndicatorValueAt(2, pos):
+            p = self.IndicatorStart(2, pos)
+            q = self.IndicatorEnd(2, pos)
+            text = self.GetTextRange(p, q).strip()
+            ## Note: Do postcall a confirmation dialog.
+            wx.CallAfter(self.parent.load_url, text)
+    
+    def on_modified(self, buf):
+        """Called when the buffer is modified."""
+        self.SetIndicatorCurrent(2)
+        self.IndicatorClearRange(0, self.TextLength)
+        for m in self.grep(url_re):
+            p, q = m.span()
+            self.IndicatorFillRange(p, q-p)
+    
     def OnSavePointLeft(self, evt):
         if self.mtdelta is not None:
             self.parent.handler('buffer_caption_reset', self)
@@ -1670,7 +1706,7 @@ class Buffer(EditWindow, EditorInterface):
                             sender=self, command=None, more=False)
         except Exception as e:
             msg = traceback.format_exc()
-            err = re.findall(r"^\s+File \"(.*?)\", line ([0-9]+)", msg, re.M)
+            err = re.findall(py_error_re, msg, re.M)
             lines = [int(l) for f,l in err if f == filename]
             if lines:
                 lx = lines[-1] - 1
@@ -1686,7 +1722,7 @@ class Buffer(EditWindow, EditorInterface):
             self.code = code
             del self.pointer # Reset pointer (debugger hook point).
             del self.red_arrow
-            self.handler('py_region_executed', self)
+            self.handler('buffer_region_executed', self)
             self.message("Evaluated {!r} successfully".format(filename))
             self.AnnotationClearAll()
     
@@ -1743,7 +1779,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         def destroy(v):
             obj = v.EventObject
             if isinstance(obj, Buffer):
-                self.handler('buffer_removed', obj)
+                self.handler('buffer_deleted', obj)
             v.Skip()
         self.Bind(wx.EVT_WINDOW_DESTROY, destroy)
         
@@ -1759,7 +1795,8 @@ class EditorBook(AuiNotebook, CtrlInterface):
                    'buffer_new' : [ None, dispatch, ],
                  'buffer_saved' : [ None, dispatch, self.set_caption ],
                 'buffer_loaded' : [ None, dispatch, self.set_caption ],
-               'buffer_removed' : [ None, dispatch, ],
+               'buffer_deleted' : [ None, dispatch, ],
+              'buffer_modified' : [ None, dispatch, ],
              'buffer_activated' : [ None, dispatch, self.on_activated ],
            'buffer_inactivated' : [ None, dispatch, self.on_inactivated ],
          'buffer_caption_reset' : [ None, dispatch, self.set_caption ],
@@ -1772,8 +1809,6 @@ class EditorBook(AuiNotebook, CtrlInterface):
                    '* released' : (0, skip),
                  'M-up pressed' : (0, _F(self.previous_buffer)),
                'M-down pressed' : (0, _F(self.next_buffer)),
-               'M-left pressed' : (0, dispatch),
-              'M-right pressed' : (0, dispatch),
             },
         })
     
@@ -1901,7 +1936,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         buf.SetFocus()
         return buf
     
-    def remove_buffer(self, buf=None):
+    def delete_buffer(self, buf=None):
         """Pop the current buffer from the buffer list."""
         if not buf:
             buf = self.buffer
@@ -1911,7 +1946,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
             if not self.buffer: # no buffers
                 self.new_buffer()
     
-    def remove_all_buffers(self):
+    def delete_all_buffers(self):
         """Initialize list of buffers."""
         self.DeleteAllPages()
         self.new_buffer()
@@ -1989,7 +2024,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
             return False
         except Exception as e:
             self.post_message("Failed to load {!r}: {}".format(buf.name, e))
-            self.remove_buffer(buf)
+            self.delete_buffer(buf)
             if org:
                 self.swap_page(org)
             return False
@@ -2087,7 +2122,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
                 self.post_message("The close has been canceled.")
                 return None
-        wx.CallAfter(self.remove_buffer, buf)
+        wx.CallAfter(self.delete_buffer, buf)
     
     def kill_all_buffers(self):
         for buf in self.all_buffers:
@@ -2100,7 +2135,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                         style=wx.YES_NO|wx.ICON_INFORMATION) != wx.YES:
                     self.post_message("The close has been canceled.")
                     return None
-        wx.CallAfter(self.remove_all_buffers)
+        wx.CallAfter(self.delete_all_buffers)
 
 
 class Interpreter(interpreter.Interpreter):
@@ -2396,9 +2431,9 @@ class Nautilus(Shell, EditorInterface):
         
         self.handler.update({ # DNA<Nautilus>
             None : {
-                  'stc_updated' : [ None, ],
                  'interp_error' : [ None, self.on_interp_error ],
                 'shell_deleted' : [ None, dispatch, self.on_deleted ],
+               'shell_modified' : [ None, dispatch, ],
               'shell_activated' : [ None, dispatch, self.on_activated ],
             'shell_inactivated' : [ None, dispatch, self.on_inactivated ],
              '*button* pressed' : [ None, dispatch, skip ],
@@ -2628,7 +2663,8 @@ class Nautilus(Shell, EditorInterface):
                         tip = tip.splitlines()[0]
                     self.message(tip) # clear if no tip
                     self.__text = text
-            self.handler('stc_updated', evt)
+            if evt.Updated & stc.STC_UPDATE_CONTENT:
+                self.handler('shell_modified', self)
         evt.Skip()
     
     def OnCallTipClick(self, evt):
@@ -2908,7 +2944,7 @@ class Nautilus(Shell, EditorInterface):
             Argument `text` is raw output:str with no magic cast.
         """
         ln = self.cmdline_region[0]
-        err = re.findall(r"^\s+File \"(.*?)\", line ([0-9]+)", text, re.M)
+        err = re.findall(py_error_re, text, re.M)
         self.add_marker(ln, 1 if not err else 2) # 1:white-arrow 2:red-arrow
         return (not err)
     
@@ -3149,7 +3185,7 @@ class Nautilus(Shell, EditorInterface):
             lstr = line.lstrip()
             if (lstr and lstr == line # no indent
                 and not lstr.startswith('#') # no comment
-                and not re.match(self.py_outdent_re, lstr)): # no outdent pattern
+                and not re.match(py_outdent_re, lstr)): # no outdent pattern
                 if cmd:
                     commands.append(cmd) # Add stacked commands to the list
                 cmd = line
@@ -3161,7 +3197,7 @@ class Nautilus(Shell, EditorInterface):
         if len(commands) > 1:
             suffix = sys.ps2
             for j, cmd in enumerate(commands):
-                if re.match(self.py_indent_re, cmd):
+                if re.match(py_indent_re, cmd):
                     ## multi-line code-block ends with [\r\n... ]
                     if not cmd.endswith(os.linesep):
                         cmd = cmd.rstrip('\r\n') + os.linesep
@@ -3191,7 +3227,7 @@ class Nautilus(Shell, EditorInterface):
             lstr = line.lstrip()
             if (lstr and lstr == line # no indent
                 and not lstr.startswith('#') # no comment
-                and not re.match(self.py_outdent_re, lstr)): # no outdent pattern
+                and not re.match(py_outdent_re, lstr)): # no outdent pattern
                 if cmd:
                     commands.append(cmd) # Add the previous command to the list
                 cmd = line
@@ -3297,7 +3333,7 @@ class Nautilus(Shell, EditorInterface):
                 self.exec(code)
             except Exception as e:
                 msg = traceback.format_exc()
-                err = re.findall(r"^\s+File \"(.*?)\", line ([0-9]+)", msg, re.M)
+                err = re.findall(py_error_re, msg, re.M)
                 lines = [int(l) for f,l in err if f == filename]
                 if lines:
                     region = self.get_region(self.cline)

{mwxlib-0.83.6.dist-info → mwxlib-0.83.8.dist-info}/METADATA

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

@@ -1,13 +1,13 @@
 mwx/__init__.py,sha256=bSRdncjfSCKycMFQVnagOi9R2vUCC5snGkjea7jqPgU,2520
 mwx/controls.py,sha256=7hnSimA3bKDgTct29l6Hqpq7BCKqCeOjZJ6JQ1xjh7I,43445
-mwx/framework.py,sha256=RMhgj174gLaoLZFYBC74_25gD7Fp081eew5EeA7m0jk,73366
+mwx/framework.py,sha256=7CbmEyVepYjv-DARsrmERJbiGXH8YNhD5WXz7iy-D28,73366
 mwx/graphman.py,sha256=Edw2pZKghWGkbR_AV9PDWQpZz6q8XstTL5Q-xDrAce4,69534
 mwx/images.py,sha256=9e8X7OpJ6Z3fF3ez17P_qk2D1NMO10-lN8TCtulAqT0,46248
 mwx/matplot2.py,sha256=W_FpY0S33crCAh7N9YTXo-jgYzj8uL9gqXkekfQo7Pk,36017
 mwx/matplot2g.py,sha256=cBuLMnQt3XSKQL9io0XJb_v8Lv0pO9hm0IMjVIERtu4,68253
 mwx/matplot2lg.py,sha256=h_aFij_7ksG2DXuYCaGmjtlcl122vZnwbMTv21Mprcg,27606
 mwx/mgplt.py,sha256=49_wpFZUEKErQmtobqrlNKDjWlAsdLft-izlqSyGPD0,6878
-mwx/nutshell.py,sha256=_cNKd_f5heEFcYb4PvlVNZqyLPNCNpDH8wAHFgDwmXw,137383
+mwx/nutshell.py,sha256=BRrIXocO_EvgjWYbCrjnZjbCfXi-K5CLGBTQ_1u5aAI,138533
 mwx/utilus.py,sha256=H4wXPBix3zmq8wGn6YQKMO7aohSnPh_3fxUkAjDX0ZQ,37504
 mwx/wxmon.py,sha256=hEXto7dD5JunPf-iv2hhcwTIILLkNPlcl6wRt20_Wqc,11343
 mwx/wxpdb.py,sha256=M_xxXzIYhAwO1IHXVkjIC4Y2JCCCGLdgPL5R4bRtp04,19367
@@ -15,8 +15,8 @@ mwx/wxwil.py,sha256=DPXXx4OdEzvHr-_jxz9J29Ozufmb6Vr7rXVkG_LKQd0,5254
 mwx/wxwit.py,sha256=UG361QTUheO_hlSIRgkprrGUYh0IzHB8ZqOoJeeMzUs,7424
 mwx/py/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mwx/py/filling.py,sha256=f6KMBcBv7gwrl6qmJYLTL-O0Z47bWNAdTCZtUZIo8vM,16794
-mwxlib-0.83.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.83.6.dist-info/METADATA,sha256=Ld0rMHR_ESJ7ATfAKtUwDUnJ8XbtRG-E9rMjo5ZTSuY,1893
-mwxlib-0.83.6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-mwxlib-0.83.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.83.6.dist-info/RECORD,,
+mwxlib-0.83.8.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.83.8.dist-info/METADATA,sha256=RNWGhyeOHhPaaH9iHnWXecoVXZxlQLB5hpGmkesRs7k,1893
+mwxlib-0.83.8.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+mwxlib-0.83.8.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.83.8.dist-info/RECORD,,