mwxlib 0.98.0__py3-none-any.whl → 0.98.1__py3-none-any.whl

mwx/framework.py

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

mwx/nutshell.py

@@ -72,14 +72,22 @@ def ask(f, prompt="Enter value", type=str):
 
 
 class AutoCompInterfaceMixin:
-    """Auto completion interface.
+    """Auto-complete mode interface.
+    
+    Mode name           Mode vars.
+    --------------------------------
+    [1] history-comp    history (an instance variable of the Shell)
+    [2] word-comp       -
+    [3] apropos-comp    -
+    [4] text-comp       fragmwords
+    [5] module-comp     modules
     
     Note:
         This class is mixed-in ``wx.py.editwindow.EditWindow``.
     """
-    modules = set() # to be used in module-comp mode
-    
-    fragmwords = set(keyword.kwlist + dir(builtins)) # to be used in text-comp mode
+    history = []     # used in history-comp mode
+    modules = set()  # used in module-comp mode
+    fragmwords = set(keyword.kwlist + dir(builtins)) # used in text-comp mode
     
     def __init__(self):
         ## cf. sys.modules
@@ -94,10 +102,9 @@ class AutoCompInterfaceMixin:
         (override) Snip the tip of max N lines if it is too long.
                    Keep the tip for calltip-click event.
         """
-        self._calltip_pos = pos
-        self._calltip = tip
+        self._calltips = (pos, tip)
         lines = tip.splitlines()
-        if len(lines) > N > 0:
+        if N and len(lines) > N > 0:
             lines[N+1:] = ["\n...(snip) This tips are too long... "
                            "Click to show more details."]
             tip = '\n'.join(lines)
@@ -1836,7 +1843,6 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
                     '. pressed' : (2, skip),
                   'M-. pressed' : (2, self.call_word_autocomp),
                   'M-/ pressed' : (3, self.call_apropos_autocomp),
-                  'M-m pressed' : (5, self.call_module_autocomp),
             },
             2 : { # word auto completion AS-mode
                          'quit' : (0, clear_autocomp),
@@ -1892,34 +1898,6 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
              '*[LR]win pressed' : (3, ),
              '*f[0-9]* pressed' : (3, ),
             },
-            5 : { # module auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
-                  'tab pressed' : (0, clear, skip),
-                'enter pressed' : (0, clear, skip),
-               'escape pressed' : (0, clear_autocomp),
-                   'up pressed' : (5, skip, self.on_completion_backward),
-                 'down pressed' : (5, skip, self.on_completion_forward),
-                '*left pressed' : (5, skip),
-               '*left released' : (5, self.call_module_autocomp),
-               '*right pressed' : (5, skip),
-              '*right released' : (5, self.call_module_autocomp),
-          '[a-z0-9_.,] pressed' : (5, skip),
-         '[a-z0-9_.,] released' : (5, self.call_module_autocomp),
-            'S-[a-z\\] pressed' : (5, skip),
-           'S-[a-z\\] released' : (5, self.call_module_autocomp),
-                  '\\ released' : (5, self.call_module_autocomp),
-                  'M-m pressed' : (5, _F(self.call_module_autocomp, force=1)),
-              '*delete pressed' : (5, skip),
-           '*backspace pressed' : (5, skip),
-          '*backspace released' : (5, self.call_module_autocomp),
-        'C-S-backspace pressed' : (5, ),
-                 '*alt pressed' : (5, ),
-                '*ctrl pressed' : (5, ),
-               '*shift pressed' : (5, ),
-             '*[LR]win pressed' : (5, ),
-             '*f[0-9]* pressed' : (5, ),
-            },
         })
         
         self.show_folder()
@@ -1944,7 +1922,7 @@ class Buffer(AutoCompInterfaceMixin, EditorInterface, EditWindow):
     def OnCallTipClick(self, evt):
         if self.CallTipActive():
             self.CallTipCancel()
-        self.CallTipShow(self._calltip_pos, self._calltip, N=-1)
+        self.CallTipShow(*self._calltips, N=None)
         evt.Skip()
     
     def OnIndicatorClick(self, evt):
@@ -2642,24 +2620,24 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
         ``*`` denotes the original syntax defined in wx.py.shell,
         for which, at present version, enabled with USE_MAGIC switch being on.
     
-    Autocomp-key bindings::
+    Auto-complete key bindings::
     
         C-up        : [0] retrieve previous history
         C-down      : [0] retrieve next history
-        C-j(J), M-j : [0] call tooltip of eval (for the word selected or focused)
-        C-h(H), M-h : [0] call tooltip of help (for the func selected or focused)
-        TAB         : [1] history-comp-mode
-        M-p         : [1] retrieve previous history in comp-mode
-        M-n         : [1] retrieve next history in comp-mode
-        M-.         : [2] word-comp-mode
-        M-/         : [3] apropos-comp-mode
-        M-,         : [4] text-comp-mode
-        M-m         : [5] module-comp-mode
+        C-j, M-j    : [0] call tooltip of eval (for the word selected or focused)
+        C-h, M-h    : [0] call tooltip of help (for the func selected or focused)
+        TAB         : [1] history-comp
+        M-p         : [1] retrieve previous history in history-comp mode
+        M-n         : [1] retrieve next history in history-comp mode
+        M-.         : [2] word-comp
+        M-/         : [3] apropos-comp
+        M-,         : [4] text-comp
+        M-m         : [5] module-comp
         
         Autocomps are incremental when pressed any alnums,
                   and decremental when backspace.
     
-    Enter-key bindings::
+    Enter key bindings::
     
         C-enter     : insert-line-break
         M-enter     : duplicate-command
@@ -3070,7 +3048,7 @@ class Nautilus(AutoCompInterfaceMixin, EditorInterface, Shell):
     def OnCallTipClick(self, evt):
         if self.CallTipActive():
             self.CallTipCancel()
-        self.parent.handler('add_help', self._calltip)
+        self.parent.handler('add_help', self._calltips[1])
         evt.Skip()
     
     def OnDrag(self, evt): #<wx._core.StyledTextEvent>

{mwxlib-0.98.0.dist-info → mwxlib-0.98.1.dist-info}/METADATA

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

{mwxlib-0.98.0.dist-info → mwxlib-0.98.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
 mwx/bookshelf.py,sha256=Y4xI2SrEO22DrI1hyyfFx7DfFZA8znOzX9RWMPsA2BE,5137
 mwx/controls.py,sha256=K4GJB81TXv5q0faTELQgbUmtMQBRIM9yINJdTI0xA3g,47556
-mwx/framework.py,sha256=kKG4rcBiq-PD5v1sHLtI1XRTve0wugG6JwwNbMv5Pa8,75509
+mwx/framework.py,sha256=xSh2cxTyg6SHU3jh9cGTaiC2u7teJPJwRuFrmEfSXiQ,75509
 mwx/graphman.py,sha256=Cyhl_Da_HGBfk721gu1r5iwSH9L3yPEG8Fzmc2gx-EU,70462
 mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
 mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
 mwx/matplot2g.py,sha256=wiZFDFuQe3ax71fmyeR_9hvAmgT-4nVfZ30UByv8Nv8,64379
 mwx/matplot2lg.py,sha256=JRWjWnLJUytbSq6wxs4P0gbVUr3xoLSF6Wwqd5V_pJI,27404
 mwx/mgplt.py,sha256=ITzxA97yDwr_35BUk5OqnyskSuKVDbpf2AQCKY1jHTI,5671
-mwx/nutshell.py,sha256=iVJGFh45ZtXs_g8LGi1UNI6H-3jI2pDkYNc2eF3T-7k,142853
+mwx/nutshell.py,sha256=nTEKmJ0CMqkVtbmIlDHvZDpkUjefgL6QbxMZKwbZpIk,141553
 mwx/utilus.py,sha256=mmqB4P_3mTi7SrFleMiN1599Jm0Us0XKnNA6v2xglSs,37333
 mwx/wxmon.py,sha256=f3V24EF7kdMlYF7usLYK9QE5KU6fSu0jVqsvwAiA-Ag,12647
 mwx/wxpdb.py,sha256=lLowkkAgMhPFHAfklD7wZHq0qbSMjRxnBFtSajmVgME,19133
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=hbApzZWa9-BmQthu7uZBlBbGbtf4iJ_prO8IhxoGMs8
 mwx/plugins/line_profile.py,sha256=--9NIc3x5EfRB3L59JvD7rzENQHyiYfu7wWJo6AuMkA,820
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-0.98.0.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.98.0.dist-info/METADATA,sha256=qAaHXqyArN_ZNCNoeukt6YxYGPQ-n8h9JIgfAcKuBnU,1880
-mwxlib-0.98.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-mwxlib-0.98.0.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.98.0.dist-info/RECORD,,
+mwxlib-0.98.1.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.98.1.dist-info/METADATA,sha256=XcUcwip9zlP_OGddgjt4s8fHdRvz7pGU-y1NS1t4kXg,1880
+mwxlib-0.98.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+mwxlib-0.98.1.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.98.1.dist-info/RECORD,,