mwxlib 1.5.10__py3-none-any.whl → 1.5.12__py3-none-any.whl

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.5.10"
+__version__ = "1.5.12"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -49,10 +49,6 @@ def deb(target=None, loop=True, locals=None, **kwargs):
     kwargs.setdefault("execStartupScript", True)
     kwargs.setdefault("standalone", True)
     
-    if "debrc" in kwargs:  # for backward compatibility
-        warn("Deprecated keyword: 'debrc'. Use 'session' instead.", DeprecationWarning)
-        kwargs.setdefault('session', kwargs.pop('debrc'))
-    
     app = wx.GetApp() or wx.App()
     frame = ShellFrame(None, target, **kwargs)
     frame.Show()

mwx/graphman.py

@@ -37,19 +37,6 @@ from .matplot2lg import LineProfile  # noqa
 from .matplot2lg import Histogram
 
 
-def split_paths(obj):
-    """Split obj path into dirname and basename.
-    The object can be module name:str, module, or class.
-    """
-    if hasattr(obj, '__file__'): #<class 'module'>
-        obj = obj.__file__
-    elif isinstance(obj, type):  #<class 'type'>
-        obj = inspect.getsourcefile(obj)
-    if obj.endswith(".py"):
-        obj, _ = os.path.splitext(obj)
-    return os.path.split(obj)
-
-
 class Thread:
     """Thread manager for graphman.Layer
     
@@ -194,13 +181,13 @@ class Thread:
             except KeyboardInterrupt as e:
                 print("- Thread terminated by user:", e)
             except Exception as e:
+                print("- Thread failed in error:", e)
+                traceback.print_exc()
                 tbstr = traceback.format_tb(e.__traceback__)
                 wx.CallAfter(wx.MessageBox,
                              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)
-                traceback.print_exc()
-                print("- Thread failed in error:", e)
             finally:
                 self.active = 0
                 wx.CallAfter(self.handler, 'thread_end', self)
@@ -377,18 +364,18 @@ class LayerInterface(CtrlInterface):
                 lambda v: reset_params(v, checked_only=wx.GetKeyState(wx.WXK_SHIFT)),
                 lambda v: v.Enable(bool(self.parameters))),
             (),
-            (mwx.ID_(201), "&Reload {!r}".format(self.__module__), "Reload", Icon('load'),
-                lambda v: self.parent.reload_plug(self.__module__),
+            (mwx.ID_(201), "&Reload module", "Reload", Icon('load'),
+                lambda v: self.parent.reload_plug(self),
                 lambda v: v.Enable(self.reloadable
                             and not (self.thread and self.thread.active))),
                 
-            (mwx.ID_(202), "&Unload {!r}".format(self.__module__), "Unload", Icon('delete'),
-                lambda v: self.parent.unload_plug(self.__module__),
+            (mwx.ID_(202), "&Unload module", "Unload", Icon('delete'),
+                lambda v: self.parent.unload_plug(self),
                 lambda v: v.Enable(self.unloadable
                             and not (self.thread and self.thread.active))),
             (),
             (mwx.ID_(203), "&Dive into {!r}".format(self.__module__), "dive", Icon('core'),
-                lambda v: self.parent.inspect_plug(self.__module__)),
+                lambda v: self.parent.inspect_plug(self)),
         ]
         self.Bind(wx.EVT_CONTEXT_MENU,
                   lambda v: Menu.Popup(self, self.menu))
@@ -399,7 +386,7 @@ class LayerInterface(CtrlInterface):
         try:
             self.Init()
         except Exception as e:
-            traceback.print_exc()
+            traceback.print_exc()  # Failed to initialize the plug.
             if parent:
                 bmp = wx.StaticBitmap(self, bitmap=Icon('!!!'))
                 txt = wx.StaticText(self, label="Exception")
@@ -409,8 +396,7 @@ class LayerInterface(CtrlInterface):
             if session:
                 self.load_session(session)
         except Exception:
-            traceback.print_exc()
-            print("- Failed to load session of", self)
+            traceback.print_exc()  # Failed to load the plug session.
     
     def Init(self):
         """Initialize layout before load_session (to be overridden)."""
@@ -583,8 +569,7 @@ class Graph(GraphPlot):
         del self.region
     
     def hide_layers(self):
-        for name in self.parent.plugins:
-            plug = self.parent.get_plug(name)
+        for plug in self.parent.get_all_plugs():
             for art in plug.Arts:
                 art.set_visible(0)
         self.remove_markups()
@@ -895,8 +880,7 @@ class Frame(mwx.Frame):
             elif ret == wx.ID_CANCEL:
                 evt.Veto()
                 return
-        n = sum(bool(plug.thread and plug.thread.active)
-                for plug in (self.get_plug(name) for name in self.plugins))
+        n = sum(bool(plug.thread and plug.thread.active) for plug in self.get_all_plugs())
         if n:
             s = 's' if n > 1 else ''
             if wx.MessageBox( # Confirm closing the thread.
@@ -1055,11 +1039,7 @@ class Frame(mwx.Frame):
         return plug
     
     def get_plug(self, name):
-        """Get named plug window.
-        
-        Args:
-            name : str or plug object.
-        """
+        """Get named plug window."""
         if isinstance(name, str):
             if name.endswith(".py"):
                 name, _ = os.path.splitext(os.path.basename(name))
@@ -1068,46 +1048,9 @@ class Frame(mwx.Frame):
         elif isinstance(name, LayerInterface):
             return name
     
-    def load_module(self, root):
-        """Load module of plugin (internal use only).
-        
-        Note:
-            This is called automatically from load_plug,
-            and should not be called directly from user.
-        """
-        dirname_, name = split_paths(root)
-        
-        ## Update the include-path to load the module correctly.
-        if os.path.isdir(dirname_):
-            if dirname_ in sys.path:
-                sys.path.remove(dirname_)
-            sys.path.insert(0, dirname_)
-        elif dirname_:
-            print("- No such directory {!r}".format(dirname_))
-            return False
-        
-        try:
-            if name in sys.modules:
-                module = reload(sys.modules[name])
-            else:
-                module = import_module(name)
-        except Exception as e:
-            traceback.print_exc()
-            print(f"- Unable to load {root!r}.", e)
-            return False
-        
-        ## Check if the module has a class `Plugin`.
-        if not hasattr(module, 'Plugin'):
-            if isinstance(root, type):
-                warn(f"Use dummy plug for debugging {name!r}.")
-                module.__dummy_plug__ = root
-                register(root, module)
-        else:
-            if hasattr(module, '__dummy_plug__'):
-                root = module.__dummy_plug__         # old class (imported)
-                cls = getattr(module, root.__name__) # new class (reloaded)
-                register(cls, module)
-        return module
+    def get_all_plugs(self):
+        for name, module in self.plugins.items():
+            yield module.__plug__
     
     def load_plug(self, root, force=False, session=None, show=False,
                         dock=0, floating_pos=None, floating_size=None,
@@ -1131,31 +1074,72 @@ class Frame(mwx.Frame):
             None if succeeded else False
         
         Note:
-            The root module must have a class Plugin <Layer>
+            The root module must contain a class Plugin <Layer>.
         """
         props = dict(dock_direction=dock,
                      floating_pos=floating_pos,
                      floating_size=floating_size)
         
-        _dirname, name = split_paths(root)
+        if inspect.ismodule(root):
+            name = root.__file__
+            ## name = root.__name__  @TODO: Change root module name
+        elif inspect.isclass(root):
+            name = inspect.getsourcefile(root)
+        else:
+            name = root
+        dirname_, name = os.path.split(name)  # if the name is full path,...
+        if name.endswith(".py"):
+            name = name[:-3]
+        
+        if not force:
+            ## 文字列参照 (root:str) による重複ロードを避ける @TODO: Change root module name
+            ## for mod in self.plugins.values():
+            ##     if root == mod.__file__:
+            ##         print(f"- {name!r} is already loaded as {mod.__name__!r}.")
+            ##         return None
+            ## Check if the named plug is already loaded.
+            plug = self.get_plug(name)
+            if plug:
+                self.update_pane(name, **props)
+                self.show_pane(name, show)
+                try:
+                    if session:
+                        plug.load_session(session)
+                except Exception:
+                    traceback.print_exc()  # Failed to load the plug session.
+                return None
         
-        plug = self.get_plug(name)
-        if plug and not force:
-            self.update_pane(name, **props)
-            self.show_pane(name, show)
-            try:
-                if session:
-                    plug.load_session(session)
-            except Exception:
-                traceback.print_exc()
-                print("- Failed to load session of", plug)
-            return None
+        ## Update the include-path to load the module correctly.
+        if os.path.isdir(dirname_):
+            if dirname_ in sys.path:
+                sys.path.remove(dirname_)
+            sys.path.insert(0, dirname_)
+        elif dirname_:
+            print(f"- No such directory {dirname_!r}.")
+            return False
         
-        module = self.load_module(root)
-        if not module:
+        ## Load or reload the module, and check whether it contains a class named `Plugin`.
+        try:
+            if name in sys.modules:
+                module = reload(sys.modules[name])
+            else:
+                module = import_module(name)
+        except Exception:
+            traceback.print_exc()  # Unable to load the module.
             return False
+        else:
+            if not hasattr(module, 'Plugin'):
+                if isinstance(root, type):
+                    ## warn(f"Use dummy plug for {name!r}.")
+                    module.__dummy_plug__ = root
+                    register(root, module)
+            else:
+                if hasattr(module, '__dummy_plug__'):
+                    root = module.__dummy_plug__          # old class (imported)
+                    cls = getattr(module, root.__name__)  # new class (reloaded)
+                    register(cls, module)
         
-        ## assert name == Plugin.__module__
+        ## Note: name (module.__name__) != Plugin.__module__ if module is a package.
         try:
             Plugin = module.Plugin   # Check if the module has a class `Plugin`.
             title = Plugin.category  # Plugin <LayerInterface>
@@ -1199,12 +1183,6 @@ class Frame(mwx.Frame):
                          style=wx.ICON_ERROR)
             return False
         
-        ## Add to the list after the plug is created successfully.
-        self.plugins[name] = module
-        
-        ## Set reference of a plug (one module, one plugin).
-        module.__plug__ = plug
-        
         ## Create pane or notebook pane.
         caption = plug.caption
         if not isinstance(caption, str):
@@ -1233,6 +1211,12 @@ class Frame(mwx.Frame):
                                        .Name(name).Caption(caption)
                                        .FloatingSize(size).MinSize(size).Show(0))
         
+        ## Add to the list after the plug is created successfully.
+        self.plugins[name] = module
+        
+        ## Set reference of a plug (one module, one plugin).
+        module.__plug__ = plug
+        
         ## Set winow.Name for inspection.
         plug.Name = name
         
@@ -1271,13 +1255,10 @@ class Frame(mwx.Frame):
         """Unload plugin and detach the pane from UI manager."""
         plug = self.get_plug(name)
         if not plug:
+            print(f"- {name!r} is not listed in plugins.")
             return
         
-        name = plug.__module__
-        if name not in self.plugins:
-            return
-        
-        del self.plugins[name]
+        del self.plugins[plug.Name]
         
         if plug.__Menu_item:
             menu, sep, tail = plug.menukey.rpartition('/')
@@ -1304,23 +1285,25 @@ class Frame(mwx.Frame):
             nb.Destroy()
     
     def reload_plug(self, name):
+        """Reload plugin."""
         plug = self.get_plug(name)
-        if not plug or not plug.reloadable:
+        if not plug:
+            print(f"- {name!r} is not listed in plugins.")
             return
+        
         session = {}
         try:
             print("Reloading {}...".format(plug))
             plug.save_session(session)
         except Exception:
-            traceback.print_exc()
-            print("- Failed to save session of", plug)
+            traceback.print_exc()  # Failed to save the plug session.
         self.load_plug(plug.__module__, force=1, session=session)
     
     def inspect_plug(self, name):
-        """Dive into the process to inspect plugs in the shell.
-        """
+        """Dive into the process to inspect plugs in the shell."""
         plug = self.get_plug(name)
         if not plug:
+            print(f"- {name!r} is not listed in plugins.")
             return
         
         shell = self.shellframe.clone_shell(plug)
@@ -1349,8 +1332,7 @@ class Frame(mwx.Frame):
     
     def Quit(self, evt=None):
         """Stop all Layer threads."""
-        for name in self.plugins:
-            plug = self.get_plug(name)
+        for plug in self.get_all_plugs():
             thread = plug.thread  # Note: thread can be None or shared.
             if thread and thread.active:
                 ## thread.active = 0
@@ -1775,16 +1757,14 @@ class Frame(mwx.Frame):
             for name, module in self.plugins.items():
                 plug = self.get_plug(name)
                 if '.' not in name:
-                    name = os.path.abspath(module.__file__)  # Replace name with full path.
-                    basename = os.path.basename(name)
-                    if basename == "__init__.py":  # is module package?
-                        name = name[:-12]
+                    name = module.__file__  # Replace the name with full path.
+                    if hasattr(module, '__path__'):  # is the module a package?
+                        name = os.path.dirname(name)
                 session = {}
                 try:
                     plug.save_session(session)
                 except Exception:
-                    traceback.print_exc()
-                    print("- Failed to save session of", plug)
+                    traceback.print_exc()  # Failed to save the plug session.
                 o.write("self.load_plug({!r}, session={})\n".format(name, session or None))
             o.write("self._mgr.LoadPerspective({!r})\n".format(self._mgr.SavePerspective()))
             

mwx/utilus.py

@@ -200,8 +200,12 @@ def typename(obj, docp=False, qualp=True):
         return pydoc.describe(obj)  # atom -> short description
     
     modname = getattr(obj, '__module__', None)
-    if modname and modname != "__main__" and not modname.startswith('mwx'):
-        name = modname + ('.' if qualp else '..') + name
+    if modname:
+        if qualp:
+            name = modname + '.' + name
+        else:
+            if not modname.startswith(("__main__", "mwx")):
+                name = modname + '..' + name
     
     if docp and callable(obj) and obj.__doc__:
         name += "<{!r}>".format(obj.__doc__.splitlines()[0])  # concat the first doc line

{mwxlib-1.5.10.dist-info → mwxlib-1.5.12.dist-info}/METADATA

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

{mwxlib-1.5.10.dist-info → mwxlib-1.5.12.dist-info}/RECORD

@@ -1,8 +1,8 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=yW17nMNPXKHM7LLXLpr9DaRhyFHz_OBAZ_DsuEK2QzA,8387
 mwx/controls.py,sha256=Mpzpp2eWyS_X7RjxTJay1-Fldchk-x-rUBpUhHSG-5w,49924
-mwx/framework.py,sha256=hvjhA9nWgrWkpDzx1m478BD5_1OLUrSP-dfSZN463FA,77785
-mwx/graphman.py,sha256=mrs4am6VbIT20gS2j9-ISHSIscZeP-eM_lLj3xYhufo,70012
+mwx/framework.py,sha256=XFzMG6Jah0hROirGBGjmZHsv12986GV2-bjT4sl0D5w,77574
+mwx/graphman.py,sha256=AjXd8Hyb-lCEkPuCz1C19aEi6dnt3DW8N0b89cVYITU,69905
 mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
 mwx/matplot2.py,sha256=5Z-m9KXtSXpzBQs3swqPbfl_mfVdDoPaWKqpiepfau8,33019
 mwx/matplot2g.py,sha256=hLBYWjXPc2jgtKPTQWCdieIegQvS4jjUUaedV4qDLoE,65255
@@ -10,7 +10,7 @@ mwx/matplot2lg.py,sha256=fpxOX18vonUTpA_nAr-wBhQ_2YNsL_nfxdCDliuP1sU,27430
 mwx/mgplt.py,sha256=SVUJ0ls4gC9xulbWxK2qqmDxf0uBCflvwoPkxoF5s3M,5566
 mwx/nutshell.py,sha256=CX-NK3kOEi3JHhjKh39R2_m1po1SvMxraaDk2xt6q-Y,147617
 mwx/testsuite.py,sha256=0Q_n_XOOsZ8lsLWUkuO8QW00hts9wEQfnUKMpf0BAyU,1235
-mwx/utilus.py,sha256=YVU-2aR9_22-clA0OCFKfmW0c49uhNWdbQaNXxNKXxA,38964
+mwx/utilus.py,sha256=dsJ_wsEjqm-B75It-lwVCAiCPyPXZerngm_6TCUEmRU,39028
 mwx/wxmon.py,sha256=NIksW_CZv7Kw4dod8tWVwakO4iJuvE8hJSAcjkYfLaE,12800
 mwx/wxpdb.py,sha256=kKzEGivjoZ9zGcB3ttYsAym4putyilmXZXj-5CGaivQ,18813
 mwx/wxwil.py,sha256=hhyB1lPrF9ixeObxCOKQv0Theu-B-kpJg_yVU3EGSNg,5406
@@ -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=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-1.5.10.dist-info/METADATA,sha256=TVRXE_-HQOVN7z-VvBMRAs1IKcYwvsPoWP-qS8Bcwh4,7382
-mwxlib-1.5.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mwxlib-1.5.10.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.5.10.dist-info/RECORD,,
+mwxlib-1.5.12.dist-info/METADATA,sha256=h77mRadmYbztrngMyjSysNdiM9fGxuQcbIN9zCpRpcY,7382
+mwxlib-1.5.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mwxlib-1.5.12.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.5.12.dist-info/RECORD,,