mwxlib 1.6.3__py3-none-any.whl → 1.6.4__py3-none-any.whl

mwx/framework.py

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

mwx/graphman.py

@@ -488,18 +488,22 @@ class Layer(LayerInterface, KnobCtrlPanel):
         LayerInterface.__init__(self, parent, session)
 
 
-def _register__dummy_plug__(cls, module):
+def _register__dummy_plug__(cls, module, flag):
     if issubclass(cls, LayerInterface):
         ## warn(f"Duplicate iniheritance of LayerInterface by {cls}.")
         module.Plugin = cls
         return cls
     
-    class _Plugin(LayerInterface, cls):
+    class _Plugin(cls, LayerInterface):
         def __init__(self, parent, session=None, **kwargs):
             cls.__init__(self, parent, **kwargs)
             LayerInterface.__init__(self, parent, session)
+        Show = LayerInterface.Show
+        IsShown = LayerInterface.IsShown
     
+    _Plugin.reloadable = getattr(cls, "reloadable", flag)
     _Plugin.__module__ = module.__name__
+    _Plugin.__qualname__ = cls.__qualname__ + "~"
     _Plugin.__name__ = cls.__name__ + "~"
     _Plugin.__doc__ = cls.__doc__
     module.Plugin = _Plugin
@@ -1105,31 +1109,30 @@ class Frame(mwx.Frame):
         
         ## Load or reload the module, and check whether it contains a class named `Plugin`.
         try:
-            if name in sys.modules:
+            loadable = (not name.startswith("__main__"))  # Check if the module is loadable.
+            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:
                 module = import_module(name)
         except Exception:
-            module = inspect.getmodule(name)  # __main__ ? Check if the module is dummy.
-            if module:
-                traceback.print_exc()  # Unable to load the module.
-                return False
-            else:
-                module = types.ModuleType(name)  # dummy module (cannot reload)
-                module.__file__ = "<scratch>"
-                ## sys.modules[name] = module
-        
-        ## Register dummy plug; Add module.Plugin <Layer>.
-        if not hasattr(module, 'Plugin'):
-            if inspect.isclass(root):
-                _register__dummy_plug__(root, module)
-                module.__dummy_plug__ = root
+            traceback.print_exc()  # Unable to load the module.
+            return False
         else:
-            if hasattr(module, '__dummy_plug__'):
-                cls = module.__dummy_plug__          # old class (imported)
-                cls = getattr(module, cls.__name__)  # new class (reloaded)
-                _register__dummy_plug__(cls, module)
-                module.__dummy_plug__ = cls
+            ## Register dummy plug; Add module.Plugin <Layer>.
+            if not hasattr(module, 'Plugin'):
+                if inspect.isclass(root):
+                    _register__dummy_plug__(root, module, loadable)
+                    module.__dummy_plug__ = root
+            else:
+                if hasattr(module, '__dummy_plug__'):     # Reloading dummy plug...
+                    cls = module.__dummy_plug__           # old class (imported)
+                    root = getattr(module, cls.__name__)  # new class (reloaded)
+                    _register__dummy_plug__(root, module, loadable)
+                    module.__dummy_plug__ = root
         
         ## Note: name (module.__name__) != Plugin.__module__ if module is a package.
         try:

mwx/nutshell.py

@@ -485,8 +485,8 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         This class is mixed-in ``wx.stc.StyledTextCtrl``.
     """
     def __init__(self):
-        CtrlInterface.__init__(self)
         AutoCompInterfaceMixin.__init__(self)
+        CtrlInterface.__init__(self)
         
         def dispatch(evt):
             """Fork events to the parent."""

mwx/testsuite.py

@@ -17,7 +17,7 @@ Is equivalent to:
 from contextlib import contextmanager
 import wx
 
-__all__ = ["testApp", "testFrame"]
+__all__ = ["testApp", "testFrame", "register_plug"]
 
 
 @contextmanager
@@ -31,8 +31,22 @@ def testApp():
 
 @contextmanager
 def testFrame(**kwargs):
-    with testApp():
+    with testApp() as app:
         frm = wx.Frame(None, **kwargs)
         yield frm
         frm.Show()
+        app.SetTopWindow(frm)
 ## wx.Frame.run = staticmethod(testFrame)
+
+
+def register_plug(cls=None, **kwargs):
+    if cls is None:
+        return lambda f: register(f, **kwargs)
+    
+    from mwx.graphman import Frame
+    with testApp() as app:
+        frm = app.GetTopWindow() or Frame(None)
+        frm.load_plug(cls, force=1, show=1, **kwargs)
+        frm.Show()
+        app.SetTopWindow(frm)
+    return cls

{mwxlib-1.6.3.dist-info → mwxlib-1.6.4.dist-info}/METADATA

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

{mwxlib-1.6.3.dist-info → mwxlib-1.6.4.dist-info}/RECORD

@@ -1,15 +1,15 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=yW17nMNPXKHM7LLXLpr9DaRhyFHz_OBAZ_DsuEK2QzA,8387
 mwx/controls.py,sha256=B9f_A0ev3SPf75K-LIZCusMLeDGYz1O3cMml7IOrDrM,49870
-mwx/framework.py,sha256=J6f1PekG4O0fwH5n4aNnR6qvXV6FAgmA0QOIEE8PCvY,77463
-mwx/graphman.py,sha256=SL0msdXDqbw2GswBbspFa916z2fJbHYTDph9vcRP1yU,69917
+mwx/framework.py,sha256=T-6ILuhLC7wQ0jB4CcovzLxzQ3NwtbfCIRMwfJxg6qE,77463
+mwx/graphman.py,sha256=Omv14il6ufr_RZayTJiPY-6fX-jAt6g5erGw4OuZlqA,70199
 mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
 mwx/matplot2.py,sha256=cjdN12RENqWFw1v9QyO05XQc6dK3Pn_ltdC3OfmhGfg,32995
 mwx/matplot2g.py,sha256=0gxjl7UKx8QGRI2thpniA7dQu9fpHGG0mvl7Ml2exrc,65474
 mwx/matplot2lg.py,sha256=jE-LYPEVaEapQN8L-eviRyEx4Lw-8GyLGzZotrIZShU,27413
 mwx/mgplt.py,sha256=SVUJ0ls4gC9xulbWxK2qqmDxf0uBCflvwoPkxoF5s3M,5566
-mwx/nutshell.py,sha256=Sa5PKSiXxT74Mj_vE9fUinxkfm5Xtg1MGGUjwbRH-yY,147552
-mwx/testsuite.py,sha256=pBB7ZNicI_thrg6LmNPgUOgfMWwRoAaYWN1nFy6t6S4,790
+mwx/nutshell.py,sha256=JHFiY-X1pEdFBzSQRXO_loIhJyPuWljWhhGzie3m7TU,147552
+mwx/testsuite.py,sha256=Sd4w4UGmD6bFrKQlAOSJBGio3uDgnLQgzXS1CbY86rw,1199
 mwx/utilus.py,sha256=JOYBTHoo_GmYykX72PgiPzgD2M-1pcOR8gMBLc2bnck,39016
 mwx/wxmon.py,sha256=aS6lSjDm0PxIhfyBPtg-wIP0v-R3g2K5a3k2mclWSrQ,12798
 mwx/wxpdb.py,sha256=ehRawAnqQberUeDN9j_-drWYQzu23w5UeQyto4nj53g,18812
@@ -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.3.dist-info/METADATA,sha256=QbzAtx8OsYdp8LIL8pvOgmh_qgGAIxGLtGsdKuOj-9w,7381
-mwxlib-1.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mwxlib-1.6.3.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.6.3.dist-info/RECORD,,
+mwxlib-1.6.4.dist-info/METADATA,sha256=ZafN1sf9Ovxith57qzq87MOYTCEkWFctSAhfIZpux2E,7381
+mwxlib-1.6.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mwxlib-1.6.4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.6.4.dist-info/RECORD,,