fix autocomplete

diff --git a/rainbowstream/interactive.py b/rainbowstream/interactive.py
index 47a257633a68a8685e68d18014d5ae5bd9ce5f10..98b9c21bc8ea08270b9ad8f6db1c675bc1114576 100644 (file)
--- a/rainbowstream/interactive.py
+++ b/rainbowstream/interactive.py
@@ -1,5 +1,4 @@
 import readline
-import rlcompleter
 import os.path
 
 from .config import *
@@ -33,6 +32,8 @@ class RainbowCompleter(object):
                 try:
                     if begin == 0:
                         candidates = self.options.keys()
+                    elif words[-1] in self.options[words[0]]:
+                        candidates = []
                     else:
                         first = words[0]
                         candidates = self.options[first]
@@ -43,7 +44,7 @@ class RainbowCompleter(object):
                     else:
                         self.current_candidates = candidates
 
-                except (KeyError, IndexError), err:
+                except (KeyError, IndexError):
                     self.current_candidates = []
 
         try:
@@ -84,9 +85,9 @@ def init_interactive_shell(d):
     """
     readline.set_completer(RainbowCompleter(d).complete)
     readline.parse_and_bind('set editing-mode vi')
-    readline.parse_and_bind("set input-meta on")
-    readline.parse_and_bind("set convert-meta off")
-    readline.parse_and_bind("set output-meta on")
+    readline.parse_and_bind('set show-all-if-ambiguous on')
+    readline.parse_and_bind('set show-all-if-unmodified on')
+    readline.parse_and_bind('set skip-completed-text on')
     if 'libedit' in readline.__doc__:
         readline.parse_and_bind("bind ^I rl_complete")
     else:

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 888b261f99fdbf52a06b012e1f5b093fc1926615..754b129844db3f561a3df7c88c9a76cc6762034e 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -599,7 +599,7 @@ def listen():
     d = dict(zip(
         cmdset,
         [
-            ['public #', 'mine'],  # switch
+            ['public', 'mine'],  # switch
             [],  # home
             ['@'],  # view
             [],  # tweet
@@ -610,8 +610,8 @@ def listen():
             [],  # unfavorite
             ['#'],  # search
             ['image'],  # show image
-            [],  # follow
-            [],  # unfollow
+            ['@'],  # follow
+            ['@'],  # unfollow
             [],  # help
             [],  # clear
             [],  # quit