mwxlib 0.92.2__py3-none-any.whl → 0.92.4__py3-none-any.whl

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.92.2"
+__version__ = "0.92.4"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from functools import wraps, partial
@@ -1108,8 +1108,8 @@ class ShellFrame(MiniFrame):
         
         self.ghost = AuiNotebook(self, size=(600,400))
         self.ghost.AddPage(self.Scratch, "Scratch")
-        self.ghost.AddPage(self.Log,     "Log")
-        self.ghost.AddPage(self.Help,    "Help")
+        self.ghost.AddPage(self.Log, "Log")
+        self.ghost.AddPage(self.Help, "Help")
         self.ghost.Name = "ghost"
         
         self.Bookshelf = EditorTreeCtrl(self, name="Bookshelf",
@@ -1249,12 +1249,9 @@ class ShellFrame(MiniFrame):
         self.Log.set_attributes(ReadOnly=True)
         self.Help.set_attributes(ReadOnly=True)
         
-        msg = "#! Opened: <{}>\r\n".format(datetime.datetime.now())
-        self.add_log(msg)
-        
         self.load_session(
             os.path.abspath(debrc) if debrc else self.SESSION_FILE)
-    
+        
     SESSION_FILE = get_rootpath(".debrc")
     SCRATCH_FILE = get_rootpath("scratch.py")
     LOGGING_FILE = get_rootpath("deb-logging.log")
@@ -1272,7 +1269,10 @@ class ShellFrame(MiniFrame):
         
         if flush:
             for book in self.all_books:
-                book.delete_all_buffers()
+                book.delete_all_buffers() # Note: *log* is also flushed.
+        
+        msg = "#! Opened: <{}>\r\n".format(datetime.datetime.now())
+        self.add_log(msg)
         
         def _fload(editor, filename):
             try:
@@ -1318,7 +1318,7 @@ class ShellFrame(MiniFrame):
                 pass
         
         _fsave(self.Scratch, self.SCRATCH_FILE) # save scratch
-        _fsave(self.Log,     self.LOGGING_FILE)
+        _fsave(self.Log,     self.LOGGING_FILE) # save log
         
         with open(self.SESSION_FILE, 'w', encoding='utf-8', newline='') as o:
             o.write("#! Session file (This file is generated automatically)\n")
@@ -1687,7 +1687,6 @@ class ShellFrame(MiniFrame):
     def debug(self, obj, *args, **kwargs):
         shell = self.debugger.interactive_shell
         self.debugger.interactive_shell = self.current_shell
-        self.debugger.editor = self.Log # set default logger
         try:
             if isinstance(obj, type(print)):
                 wx.MessageBox("Unable to debug builtin functions.\n\n"
@@ -1697,7 +1696,8 @@ class ShellFrame(MiniFrame):
                 self.debugger.debug(obj, *args, **kwargs)
             elif isinstance(obj, str):
                 filename = "<string>"
-                buf = self.Log.find_buffer(filename) or self.Log.create_buffer(filename)
+                buf = self.Scratch.find_buffer(filename)\
+                  or self.Scratch.create_buffer(filename)
                 with buf.off_readonly():
                     buf.Text = obj
                 self.debugger.run(obj, filename)
@@ -1712,6 +1712,8 @@ class ShellFrame(MiniFrame):
     
     def on_debug_begin(self, frame):
         """Called before set_trace."""
+        if not self:
+            return
         shell = self.debugger.interactive_shell
         shell.write("#<-- Enter [n]ext to continue.\n", -1)
         shell.prompt()
@@ -1724,6 +1726,8 @@ class ShellFrame(MiniFrame):
     
     def on_debug_next(self, frame):
         """Called from cmdloop."""
+        if not self:
+            return
         shell = self.debugger.interactive_shell
         shell.globals = gs = frame.f_globals
         shell.locals = ls = frame.f_locals
@@ -1743,6 +1747,8 @@ class ShellFrame(MiniFrame):
     
     def on_debug_end(self, frame):
         """Called after set_quit."""
+        if not self:
+            return
         shell = self.debugger.interactive_shell
         shell.write("#--> Debugger closed successfully.\n", -1)
         shell.prompt()
@@ -1825,9 +1831,10 @@ class ShellFrame(MiniFrame):
             ## Set a marker on the current line.
             buf.add_marker(buf.cline, 1 if noerr else 2) # 1:white 2:red-arrow
             return
+        
         ## Logging text every step in case of crash.
-        with open(self.LOGGING_FILE, 'a', encoding='utf-8', newline='') as o:
-            o.write(text)
+        ## with open(self.LOGGING_FILE, 'a', encoding='utf-8', newline='') as o:
+        ##     o.write(text)
     
     def add_help(self, text):
         """Add text to the help buffer."""
@@ -1836,7 +1843,6 @@ class ShellFrame(MiniFrame):
             buf.SetText(text)
         ## Overwrite text and popup the window.
         self.popup_window(self.Help, focus=0)
-        self.Help.swap_page(buf)
     
     def clone_shell(self, target):
         if not hasattr(target, '__dict__'):
@@ -1855,6 +1861,10 @@ class ShellFrame(MiniFrame):
         if shell is self.rootshell:
             ## self.message("- Don't close the root shell.")
             return
+        if self.debugger.busy and shell is self.debugger.interactive_shell:
+            wx.MessageBox("The debugger is running.\n\n"
+                          "Enter [q]uit to exit before closing.")
+            return
         j = self.console.GetPageIndex(shell)
         if j != -1:
             self.console.DeletePage(j) # Destroy the window

mwx/nutshell.py

@@ -287,6 +287,7 @@ class EditorInterface(CtrlInterface):
         self.IndentationGuides = stc.STC_IV_LOOKFORWARD
         
         self.__mark = -1
+        self.__stylus = {}
     
     ## Custom constants embedded in stc
     stc.STC_P_WORD3 = 20
@@ -772,12 +773,17 @@ class EditorInterface(CtrlInterface):
     ## Preferences / Appearance
     ## --------------------------------
     
-    def set_style(self, spec=None, **kwargs):
+    def get_stylus(self):
+        return self.__stylus
+    
+    def set_stylus(self, spec=None, **kwargs):
         spec = spec and spec.copy() or {}
         spec.update(kwargs)
         if not spec:
             return
         
+        self.__stylus.update(spec)
+        
         def _map(sc):
             return dict(kv.partition(':')[::2] for kv in sc.split(',') if kv)
         
@@ -1182,6 +1188,7 @@ class EditorInterface(CtrlInterface):
     
     @contextmanager
     def save_excursion(self):
+        """Save buffer excursion."""
         try:
             p = self.cpos
             q = self.anchor
@@ -1196,6 +1203,7 @@ class EditorInterface(CtrlInterface):
     
     @contextmanager
     def pre_selection(self):
+        """Save buffer cpos and anchor."""
         try:
             p = self.cpos
             q = self.anchor
@@ -1208,13 +1216,26 @@ class EditorInterface(CtrlInterface):
     
     @contextmanager
     def off_readonly(self):
+        """Set buffer to be writable (ReadOnly=False) temporarily."""
+        r = self.ReadOnly
         try:
-            r = self.ReadOnly
             self.ReadOnly = 0
-            yield self
+            yield
         finally:
             self.ReadOnly = r
     
+    @contextmanager
+    def save_attributes(self, **kwargs):
+        """Save buffer attributes (e.g. ReadOnly=False)."""
+        for k, v in kwargs.items():
+            kwargs[k] = getattr(self, k)
+            setattr(self, k, v)
+        try:
+            yield
+        finally:
+            for k, v in kwargs.items():
+                setattr(self, k, v)
+    
     ## --------------------------------
     ## Edit: comment / insert / kill
     ## --------------------------------
@@ -1504,7 +1525,7 @@ class Buffer(EditWindow, EditorInterface):
         })
         
         self.show_folder()
-        self.set_style(self.STYLE)
+        self.set_stylus(self.STYLE)
     
     def __contains__(self, code):
         if inspect.iscode(code) and self.code:
@@ -1795,7 +1816,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
             buf : a buffer to apply (if None, applies to all buffers).
             **kwargs : default style.
             
-                Style           = Buffer.STYLE => set_style
+                Style           = Buffer.STYLE
                 ReadOnly        = False
                 UseTabs         = False
                 ViewEOL         = False
@@ -1809,7 +1830,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
         def _setattribute(buf, attr):
             for k, v in attr.items():
                 if k == 'Style':
-                    buf.set_style(v)
+                    buf.set_stylus(v)
                 setattr(buf, k, v)
         if buf:
             _setattribute(buf, kwargs)
@@ -2619,7 +2640,7 @@ class Nautilus(Shell, EditorInterface):
         
         self.wrap(0)
         self.show_folder()
-        self.set_style(self.STYLE)
+        self.set_stylus(self.STYLE)
         
         ## delete unnecessary arrows at startup
         del self.white_arrow

{mwxlib-0.92.2.dist-info → mwxlib-0.92.4.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.92.2
+Version: 0.92.4
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
-Author: Kazuya O'moto <komoto@jeol.co.jp>
+Author: Kazuya O'moto
 Author-email: komoto@jeol.co.jp
 License: MIT
 Classifier: License :: OSI Approved :: MIT License

{mwxlib-0.92.2.dist-info → mwxlib-0.92.4.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=5B4YSOuijG1Uo5-FLtLHGB52Cp_F4vnN--4wGPBx7do,2398
 mwx/bookshelf.py,sha256=FrissUYdGXLABOzJmMaQU6GXvu6n_9DVW3d5wGwQzjM,6613
 mwx/controls.py,sha256=toNAFJrPFDO7gb0aBU_IlW4AEIEvQJcwBxR-6e04IAc,46700
-mwx/framework.py,sha256=VTczaSaxlNF8hCQWGK_S7CQ-Kn4RB0BiQVDiTBglcYA,74560
+mwx/framework.py,sha256=8r98-kYiW2JTk2gfDLLXbB7Qq9hkecRsNEDtauyj9qc,74895
 mwx/graphman.py,sha256=PBocTQpWa-f8P5-UV2Ugd01qKCGwFe-rZiginNKu_sI,69738
 mwx/images.py,sha256=mrnUYH12I3XLVSZcEXlpVltX0XMxufbl2yRvDIQJZqc,49957
 mwx/matplot2.py,sha256=TM8V5Ggc5iL9lYyM6V4clqH_vIsgS0GsND2ay9zuT0c,32825
 mwx/matplot2g.py,sha256=owNKt2EcSkf15hYqx9lnpF9qT-WqdSkXSRsH82sYMTs,65571
 mwx/matplot2lg.py,sha256=IHURrul9JzcLO8Lyll1bW1G215pxgvutDmbQgayG70A,26341
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=lzRxbcpXdLHxi2jGrdOLl7DtFzndU4bVq_7AFEzPf5s,135472
+mwx/nutshell.py,sha256=deb8JHotpLwTIP8715ux5mzOx-cnefteweUAZh0s-fU,136115
 mwx/utilus.py,sha256=fqxJysHXdLt9OOSKDZnBOwmbHvHJPy1qH3R6dI3NLSw,36947
 mwx/wxmon.py,sha256=Qk86VbuuW2rR46pqEYLur13G_aloWz5SVv6sib30YY0,12717
 mwx/wxpdb.py,sha256=rx_h4EiLEnHbVu2S6VfhWow7NwLAiTAXKiItY4N2qsk,19464
@@ -16,8 +16,8 @@ mwx/wxwil.py,sha256=KdNaHV-5-fYSFN4h3VxXxdgpB6s5PCpuxkSbytg85eE,5586
 mwx/wxwit.py,sha256=2gFHi-8nwWRh26RdvZ_AUP--8PDjJB8TUU72y2fBUWM,7557
 mwx/py/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mwx/py/filling.py,sha256=KaHooM32hrGGgqw75Cbt8lAvACwC6RXadob9LGgNnEc,16806
-mwxlib-0.92.2.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.92.2.dist-info/METADATA,sha256=W66d4Chg_oPsESXUVTxrjNoxI1tfUDhEzryJEmNpLWA,1945
-mwxlib-0.92.2.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-mwxlib-0.92.2.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.92.2.dist-info/RECORD,,
+mwxlib-0.92.4.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.92.4.dist-info/METADATA,sha256=vt9uGOpka_Xhh-1QCZ3JPEMBPcV7B1QvBnKXdPv3_Sk,1925
+mwxlib-0.92.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+mwxlib-0.92.4.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.92.4.dist-info/RECORD,,

{mwxlib-0.92.2.dist-info → mwxlib-0.92.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any