r79050 - pyrepl/trunk/pyrepl/pyrepl

Author: antocuni
Date: Fri Nov 12 23:32:49 2010
New Revision: 79050

Modified:
   pyrepl/trunk/pyrepl/pyrepl/completing_reader.py
   pyrepl/trunk/pyrepl/pyrepl/readline.py
Log:
try to match the behaviour of readline even more: ReadlineALikeReader does not
show completions inside brackets, while pyrepl still does



Modified: pyrepl/trunk/pyrepl/pyrepl/completing_reader.py
==============================================================================
--- pyrepl/trunk/pyrepl/pyrepl/completing_reader.py	(original)
+++ pyrepl/trunk/pyrepl/pyrepl/completing_reader.py	Fri Nov 12 23:32:49 2010
@@ -58,10 +58,7 @@
     padding = maxlen - len(stripped)
     return s + ' '*padding
 
-USE_BRACKETS = True
-def build_menu(cons, wordlist, start, use_brackets=None):
-    if use_brackets is None:
-        use_brackets = USE_BRACKETS
+def build_menu(cons, wordlist, start, use_brackets):
     if use_brackets:
         item = "[ %s ]"
         padding = 4
@@ -163,7 +160,8 @@
                 if not r.cmpltn_menu_vis:
                     r.cmpltn_menu_vis = 1
                 r.cmpltn_menu, r.cmpltn_menu_end = build_menu(
-                    r.console, completions, r.cmpltn_menu_end)
+                    r.console, completions, r.cmpltn_menu_end,
+                    r.use_brackets)
                 r.dirty = 1
             elif stem + p in completions:
                 r.msg = "[ complete but not unique ]"
@@ -185,7 +183,7 @@
                                if w.startswith(stem)]
                 if completions:
                     r.cmpltn_menu, r.cmpltn_menu_end = build_menu(
-                        r.console, completions, 0)
+                        r.console, completions, 0, r.use_brackets)
                 else:
                     r.cmpltn_reset()
 
@@ -198,6 +196,7 @@
     """
     # see the comment for the complete command
     assume_immutable_completions = True
+    use_brackets = True # display completions inside []
     
     def collect_keymap(self):
         return super(CompletingReader, self).collect_keymap() + (

Modified: pyrepl/trunk/pyrepl/pyrepl/readline.py
==============================================================================
--- pyrepl/trunk/pyrepl/pyrepl/readline.py	(original)
+++ pyrepl/trunk/pyrepl/pyrepl/readline.py	Fri Nov 12 23:32:49 2010
@@ -48,6 +48,7 @@
 class ReadlineAlikeReader(HistoricalReader, CompletingReader):
 
     assume_immutable_completions = False
+    use_brackets = False
 
     def error(self, msg="none"):
         pass    # don't show error messages by default