mwxlib 1.6.7__py3-none-any.whl → 1.6.10__py3-none-any.whl

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.6.7"
+__version__ = "1.6.10"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -610,16 +610,14 @@ class Menu(wx.Menu):
                 item.SubMenu._unbind()
     
     def Destroy(self):
-        try:
+        if self.owner and not self.owner.IsBeingDeleted():
             self._unbind()
-        except Exception:
-            pass
         return wx.Menu.Destroy(self)
     
     @staticmethod
-    def Popup(parent, menulist, *args, **kwargs):
-        menu = Menu(parent, menulist)
-        parent.PopupMenu(menu, *args, **kwargs)
+    def Popup(owner, menulist, *args, **kwargs):
+        menu = Menu(owner, menulist)
+        owner.PopupMenu(menu, *args, **kwargs)
         menu.Destroy()
 
 
@@ -838,9 +836,6 @@ class MiniFrame(wx.MiniFrame, KeyCtrlInterfaceMixin):
             },
         )
         self.make_keymap('C-x')
-    
-    def Destroy(self):
-        return wx.MiniFrame.Destroy(self)
 
 
 class AuiNotebook(aui.AuiNotebook):

mwx/graphman.py

@@ -88,8 +88,6 @@ class Thread:
                 None : {
                  'thread_begin' : [ None ],
                    'thread_end' : [ None ],
-                  'thread_quit' : [ None ],
-                 'thread_error' : [ None ],
                 },
             })
     
@@ -183,7 +181,6 @@ class Thread:
                 pass
             except KeyboardInterrupt as e:
                 print("- Thread terminated by user:", e)
-                wx.CallAfter(self.handler, 'thread_quit', self)
             except Exception as e:
                 print("- Thread failed in error:", e)
                 traceback.print_exc()
@@ -192,7 +189,6 @@ class Thread:
                              f"{e}\n\n" + tbstr[-1] + f"{type(e).__name__}: {e}",
                              f"Error in the thread running {f.__name__!r}\n\n",
                              style=wx.ICON_ERROR)
-                wx.CallAfter(self.handler, 'thread_error', self)
             finally:
                 self.active = 0
                 wx.CallAfter(self.handler, 'thread_end', self)
@@ -1085,8 +1081,6 @@ class Frame(mwx.Frame):
             name = root.__module__
         else:
             name = root
-        if name == "__main__":
-            name = inspect.getfile(__import__("__main__"))
         
         dirname_, name = os.path.split(name)  # if the name is full-path:str
         if name.endswith(".py"):
@@ -1121,11 +1115,11 @@ class Frame(mwx.Frame):
         
         ## Load or reload the module, and check whether it contains a class named `Plugin`.
         try:
-            loadable = (not name.startswith("__main__"))  # Check if the module is loadable.
+            ## Check if the module is reloadable.
+            loadable = not name.startswith(("__main__", "builtins"))  # no __file__
             if not loadable:
                 module = types.ModuleType(name)  # dummy module (cannot reload)
                 module.__file__ = "<scratch>"
-                ## sys.modules[name] = module
             elif name in sys.modules:
                 module = reload(sys.modules[name])
             else:
@@ -1256,6 +1250,8 @@ class Frame(mwx.Frame):
                 self.menubar[menu] = []
             self.menubar[menu] += [plug.__Menu_item]
             self.menubar.update(menu)
+        
+        self.handler('plug_loaded', plug)
         return None
     
     def unload_plug(self, name):
@@ -1283,6 +1279,7 @@ class Frame(mwx.Frame):
             self._mgr.DetachPane(plug)
             self._mgr.Update()
         
+        self.handler('plug_unloaded', plug)
         plug.handler('page_closed', plug) # (even if not shown)
         plug.Destroy()
         

mwx/nutshell.py

@@ -2817,7 +2817,7 @@ class Nautilus(EditorInterface, Shell):
             obj.self = obj
             obj.this = inspect.getmodule(obj)
             obj.shell = self  # Overwrite the facade <wx.py.shell.ShellFacade>.
-            obj.__name__ = typename(obj)  # A namespace for ghost in the shell. cf. exec_region
+            ## obj.__name__ = typename(obj)  # A namespace for ghost in the shell. cf. exec_region
         except AttributeError:
             pass
         self.parent.handler('title_window', obj)

mwx/wxpdb.py

@@ -449,7 +449,7 @@ class Debugger(Pdb):
         try:
             Pdb.set_quit(self)
         finally:
-            if self.parent: # Check if Destroy has begun.
+            if self.parent: # Check if the parent is being deleted.
                 self.handler('debug_end', self.curframe)
     
     ## --------------------------------

{mwxlib-1.6.7.dist-info → mwxlib-1.6.10.dist-info}/METADATA

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

{mwxlib-1.6.7.dist-info → mwxlib-1.6.10.dist-info}/RECORD

@@ -1,18 +1,18 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=b3LhF0TXFRhbbjg3HUzq4qTk4BLzF713a3Tbh3_0iVI,8455
 mwx/controls.py,sha256=N_4TAEMGNBD3AiVzm4JZ6SDH8VJ2gFsRPFYF40T6yL0,50006
-mwx/framework.py,sha256=N9gTB2Uyi6FvgTVEYi7KLtHifzHajf3nYBK_b_SdQL4,77596
-mwx/graphman.py,sha256=7R-vNzu0VJ_u4eT6-7Sel_qA8BZoSfG7p7zbaf-uetA,70591
+mwx/framework.py,sha256=IqDqMB-1PlcjTtsn52XT0Iun7G8t3MKTE3UZrQ7j110,77522
+mwx/graphman.py,sha256=GEIIvpiC9H4bGDhIWFb-J4hOgch8wXvx1-Mr4nGp9zs,70371
 mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
 mwx/matplot2.py,sha256=HrURlLP-jEubuHrOhL1yvXOgeduHn1OqYnT2bWg4BoM,32995
 mwx/matplot2g.py,sha256=BzftcjoVx_sFw57osb31jsnIAwJQC8CqexCUC0AY9ZU,66533
 mwx/matplot2lg.py,sha256=91ItF-6_zc_tQGvjMgtgc1UKdI_yhe8dDCzj1nN5TQc,27411
 mwx/mgplt.py,sha256=SVUJ0ls4gC9xulbWxK2qqmDxf0uBCflvwoPkxoF5s3M,5566
-mwx/nutshell.py,sha256=-2QHKIDHEdJhCjcHmhyKBKTYQdydK6m0ssqp597Oe3Q,147505
+mwx/nutshell.py,sha256=53gi361x_ATsC8_oEtxxeZXXurpUxPGGMZRy1YV7SVw,147508
 mwx/testsuite.py,sha256=pBB7ZNicI_thrg6LmNPgUOgfMWwRoAaYWN1nFy6t6S4,790
 mwx/utilus.py,sha256=JOYBTHoo_GmYykX72PgiPzgD2M-1pcOR8gMBLc2bnck,39016
 mwx/wxmon.py,sha256=aS6lSjDm0PxIhfyBPtg-wIP0v-R3g2K5a3k2mclWSrQ,12798
-mwx/wxpdb.py,sha256=ehRawAnqQberUeDN9j_-drWYQzu23w5UeQyto4nj53g,18812
+mwx/wxpdb.py,sha256=yfpsbYvWVYG0Zubt_dsYcyuNxgkqARUHviMMvSQyjrk,18822
 mwx/wxwil.py,sha256=_74m3jEUu3ktjHKHWEEK34ck439u9A0PhDDxFVTA0_Y,5404
 mwx/wxwit.py,sha256=W7wP9loxw0dAdk5-NWMIHt19Og1h-3vFzz-8BPicHB4,7348
 mwx/plugins/__init__.py,sha256=jnJ-Sl9XJ_7BFDslD_r7dsbxsOT57q_IaEriV53XIGY,41
@@ -22,7 +22,7 @@ mwx/plugins/frame_listview.py,sha256=yd2NCgspqGfTNhj1wxuW8r1zapIm7vNzVX2iytk8CDM
 mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=vWCJoHd_oyXOeXTHtXGY7wfNQeNAZhV3GZu4xlc8GDY,16867
-mwxlib-1.6.7.dist-info/METADATA,sha256=JPmghjPapW6r7Yfk1-naUsmJBlU88iLXxPHe6-ahkpU,7381
-mwxlib-1.6.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mwxlib-1.6.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.6.7.dist-info/RECORD,,
+mwxlib-1.6.10.dist-info/METADATA,sha256=YEPsg7BMMTCCfe9pulkuXFWdOMyHm5MXm1bTgaOpQ3I,7382
+mwxlib-1.6.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mwxlib-1.6.10.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.6.10.dist-info/RECORD,,