mwxlib 1.4.20__py3-none-any.whl → 1.5.0__py3-none-any.whl

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.4.20"
+__version__ = "1.5.0"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager

mwx/graphman.py

@@ -100,8 +100,6 @@ class Thread:
                 None : {
                  'thread_begin' : [ None ], # begin processing
                    'thread_end' : [ None ], # end processing
-                  'thread_quit' : [ None ], # terminated by user
-                 'thread_error' : [ None ], # failed in error
                 },
             })
     
@@ -117,7 +115,6 @@ class Thread:
         frame = inspect.currentframe().f_back.f_back
         filename = frame.f_code.co_filename
         name = frame.f_code.co_name
-        fname, _ = os.path.splitext(os.path.basename(filename))
         
         ## Other threads are not allowed to enter.
         ct = threading.current_thread()
@@ -125,17 +122,18 @@ class Thread:
         
         ## The thread must be activated to enter.
         ## assert self.active, f"{self!r} must be activated to enter {name!r}."
-        try:
-            self.handler(f"{fname}/{name}:enter", self)
-            yield self
-        except Exception:
-            self.handler(f"{fname}/{name}:error", self)
-            raise
-        finally:
-            self.handler(f"{fname}/{name}:exit", self)
+        yield self
+    
+    def enters(self, f):
+        """Decorator to register a one-time handler for the enter event."""
+        return self.handler.binds('thread_begin', f)
+    
+    def exits(self, f):
+        """Decorator to register a one-time handler for the exit event."""
+        return self.handler.binds('thread_end', f)
     
     def wraps(self, f, *args, **kwargs):
-        """Decorator of thread starter function."""
+        """Decorator for a function that starts a new thread."""
         @wraps(f)
         def _f(*v, **kw):
             return self.Start(f, *v, *args, **kw, **kwargs)
@@ -186,21 +184,20 @@ class Thread:
         @wraps(f)
         def _f(*v, **kw):
             try:
-                self.handler('thread_begin', self)
+                wx.CallAfter(self.handler, 'thread_begin', self)
                 self.result = f(*v, **kw)
             except BdbQuit:
                 pass
             except KeyboardInterrupt as e:
-                print("- Thread execution stopped:", e)
-            except AssertionError as e:
-                print("- Thread execution failed:", e)
+                print("- Thread terminated by user:", e)
+                ## wx.CallAfter(self.handler, 'thread_quit', self)
             except Exception as e:
                 traceback.print_exc()
-                print("- Thread exception:", e)
-                self.handler('thread_error', self)
+                print("- Thread failed in error:", e)
+                ## wx.CallAfter(self.handler, 'thread_error', self)
             finally:
                 self.active = 0
-                self.handler('thread_end', self)
+                wx.CallAfter(self.handler, 'thread_end', self)
         
         if self.running:
             wx.MessageBox("The thread is running (Press [C-g] to quit).",
@@ -226,7 +223,6 @@ class Thread:
         def _stop():
             with wx.BusyInfo("One moment please, "
                              "waiting for threads to die..."):
-                self.handler('thread_quit', self)
                 self.worker.join(1)
         if self.running:
             self.active = 0
@@ -349,10 +345,6 @@ class LayerInterface(CtrlInterface):
         
         self.handler.append({ # DNA<Layer>
             None : {
-                 'thread_begin' : [ None ], # begin processing
-                   'thread_end' : [ None ], # end processing
-                  'thread_quit' : [ None ], # terminated by user
-                 'thread_error' : [ None ], # failed in error
                    'page_shown' : [ None, _F(self.Draw, show=True)  ],
                   'page_closed' : [ None, _F(self.Draw, show=False) ],
                   'page_hidden' : [ None, _F(self.Draw, show=False) ],

mwx/nutshell.py

@@ -1453,21 +1453,6 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     def grep(self, pattern, flags=re.M):
         yield from re.finditer(pattern.encode(), self.TextRaw, flags)
     
-    def search_text(self, text, mode=True):
-        """Yields positions where `text` is found.
-        If mode is True, search by word; otherwise, search by string.
-        """
-        text = text.encode()
-        pos = -1
-        p = re.compile(r"[a-zA-Z0-9_]")
-        while 1:
-            pos = self.TextRaw.find(text, pos+1)
-            if pos < 0:
-                break
-            if mode and p.search(self.get_char(pos-1) + self.get_char(pos+len(text))):
-                continue
-            yield pos
-    
     def filter_text(self):
         """Show indicators for the selected text."""
         self.__itextlines = []
@@ -1479,13 +1464,16 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
             self.message("No words")
             return
         wholeword = (not self.SelectedText)  # Enable or disable whole word search.
-        lw = len(text.encode())
+        pattern = re.escape(text)
+        if wholeword:
+            pattern = rf"\b{pattern}\b"
         lines = []
-        for p in self.search_text(text, wholeword):
+        for m in self.grep(pattern):
+            p, q = m.span()
             lines.append(self.LineFromPosition(p))
             for i in (10, 11,):
                 self.SetIndicatorCurrent(i)
-                self.IndicatorFillRange(p, lw)
+                self.IndicatorFillRange(p, q-p)
         self.__itextlines = sorted(set(lines))  # keep order, no duplication
         self.message("{}: {} found".format(text, len(lines)))
         try:

mwx/utilus.py

@@ -826,6 +826,22 @@ class FSM(dict):
                      f"  The transaction must be a list, not a tuple.")
         return action
     
+    def binds(self, event, action=None, state=None, state2=None):
+        """Append a one-time transaction to the context.
+        
+        Like `bind`, but unbinds itself after being called once.
+        """
+        if action is None:
+            return lambda f: self.binds(event, f, state, state2)
+        
+        @wraps(action)
+        def _act(*v, **kw):
+            try:
+                return action(*v, **kw)
+            finally:
+                self.unbind(event, _act, state)
+        return self.bind(event, _act, state, state2)
+    
     def unbind(self, event, action=None, state=None):
         """Remove a transaction from the context.
         

{mwxlib-1.4.20.dist-info → mwxlib-1.5.0.dist-info}/METADATA

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

{mwxlib-1.4.20.dist-info → mwxlib-1.5.0.dist-info}/RECORD

@@ -1,16 +1,16 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=XbJ9HUH5COUm-BVI7iLC7gr9Hj9l-sFjOoaCAqNS4aA,8178
 mwx/controls.py,sha256=cgYEeBn1GD1s2YrDZd3jzhlACTc9IOZED_JOA8dqTJI,49914
-mwx/framework.py,sha256=D1KILJNmv-eQ0HY8ayphIA_Fd9K19d6jHA5q27fp61M,77031
-mwx/graphman.py,sha256=sb9Y2z5bW30arFxQnOoMhjxILNUdnAZsDh9rNbY_IPI,70037
+mwx/framework.py,sha256=f5xAUMR05Y1Y_f1SDhZySOxGsfTcmW4H2JT2vHdfAg4,77030
+mwx/graphman.py,sha256=xYaBzPZlA1OJ2suk29CEtVMGJJZd1krHwjXnyxThyuo,69643
 mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
 mwx/matplot2.py,sha256=U0axLQeZAR_ys5rXHykVKkvXLibnNwXS-gm-c0U2MGw,33003
 mwx/matplot2g.py,sha256=foq-NdksvTV_I55UGxLzghp1YXaFfWgzTmigmnIe58E,65376
 mwx/matplot2lg.py,sha256=cb0EZXivccDQu4oFj5ddSUF9pEE4f5UuFJJK2ELItww,27404
 mwx/mgplt.py,sha256=KR7MWdl9J6hiiBdO0NB25Y37rP21aFdwBVsB9KZKXo8,5564
-mwx/nutshell.py,sha256=sAvHbrD9V4lMaeX_h_r8e5VYnhAe47GMRaRzoNJmtV0,146629
+mwx/nutshell.py,sha256=ELpFChIZR4GgR8dyphqvrsJtgTDBGoQRaw7_F_1VDNc,146181
 mwx/testsuite.py,sha256=Zk75onPSEn2tf0swS3l-vIn6yTXGB7allIyvJsPHj20,1229
-mwx/utilus.py,sha256=ZcKEkY2jR9pvf0bDFXyKk2Z7dDBf-NW84tDPiBlWdic,38081
+mwx/utilus.py,sha256=vu-gzLabGEaY6wAN3ThJrmjTChlZtoKYozSF0om_MOk,38642
 mwx/wxmon.py,sha256=NIksW_CZv7Kw4dod8tWVwakO4iJuvE8hJSAcjkYfLaE,12800
 mwx/wxpdb.py,sha256=aZIH7Xs-9ahDLut2P4NmvbB2zHVpI95kx4je1ophNQM,18799
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
@@ -22,7 +22,7 @@ mwx/plugins/frame_listview.py,sha256=xH1au3lI-bZwCzmhVmvNTOHDoVQIBzH4p9_8Y36Qs5U
 mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-1.4.20.dist-info/METADATA,sha256=4uLVWBcmszTutWuvX_2Sv3s4nynp2J6hEXRLo1O-uhU,7382
-mwxlib-1.4.20.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-mwxlib-1.4.20.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.4.20.dist-info/RECORD,,
+mwxlib-1.5.0.dist-info/METADATA,sha256=vbRM1kvarP86bPrshgFTy74zJ1U3NSvoEJhv6K_osHo,7381
+mwxlib-1.5.0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+mwxlib-1.5.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.5.0.dist-info/RECORD,,