Fix emacs tab-completion in ipython.el and remove the obsolete IPComp…

…leter.all_completions() helper method

IPython/core/completer.py

@@ -456,24 +456,6 @@ def __init__(self, shell, namespace=None, global_namespace=None,
                          self.python_func_kw_matches,
                          ]
 
-    # Code contributed by Alex Schmolck, for ipython/emacs integration
-    def all_completions(self, text):
-        """Return all possible completions for the benefit of emacs."""
-
-        completions = []
-        comp_append = completions.append
-        try:
-            for i in xrange(sys.maxint):
-                res = self.complete(text, i, text)
-                if not res:
-                    break
-                comp_append(res)
-        #XXX workaround for ``notDefined.<tab>``
-        except NameError:
-            pass
-        return completions
-    # /end Alex Schmolck code.
-
     def _clean_glob(self,text):
         return self.glob("%s*" % text)
 

docs/emacs/ipython.el

@@ -311,7 +311,7 @@ gets converted to:
         (replace-match "" t nil)))))
 
 (defvar ipython-completion-command-string
-  "print(';'.join(get_ipython().Completer.all_completions('%s'))) #PYTHON-MODE SILENT\n"
+  "print(';'.join(get_ipython().Completer.complete('%s')[1])) #PYTHON-MODE SILENT\n"
   "The string send to ipython to query for all possible completions")