##// END OF EJS Templates
Merge pull request #6083 from takluyver/completer-docstrings...
Thomas Kluyver -
r17143:19ed08e4 merge
parent child Browse files
Show More
@@ -80,6 +80,7 b' from IPython.core.error import TryNext'
80 from IPython.core.inputsplitter import ESC_MAGIC
80 from IPython.core.inputsplitter import ESC_MAGIC
81 from IPython.utils import generics
81 from IPython.utils import generics
82 from IPython.utils import io
82 from IPython.utils import io
83 from IPython.utils.decorators import undoc
83 from IPython.utils.dir2 import dir2
84 from IPython.utils.dir2 import dir2
84 from IPython.utils.process import arg_split
85 from IPython.utils.process import arg_split
85 from IPython.utils.py3compat import builtin_mod, string_types
86 from IPython.utils.py3compat import builtin_mod, string_types
@@ -216,7 +217,7 b' def penalize_magics_key(word):'
216 return word
217 return word
217
218
218
219
219
220 @undoc
220 class Bunch(object): pass
221 class Bunch(object): pass
221
222
222
223
@@ -865,6 +866,7 b' class IPCompleter(Completer):'
865 return argMatches
866 return argMatches
866
867
867 def dict_key_matches(self, text):
868 def dict_key_matches(self, text):
869 "Match string keys in a dictionary, after e.g. 'foo[' "
868 def get_keys(obj):
870 def get_keys(obj):
869 # Only allow completion for known in-memory dict-like types
871 # Only allow completion for known in-memory dict-like types
870 if isinstance(obj, dict) or\
872 if isinstance(obj, dict) or\
@@ -1010,9 +1012,6 b' class IPCompleter(Completer):'
1010 def complete(self, text=None, line_buffer=None, cursor_pos=None):
1012 def complete(self, text=None, line_buffer=None, cursor_pos=None):
1011 """Find completions for the given text and line context.
1013 """Find completions for the given text and line context.
1012
1014
1013 This is called successively with state == 0, 1, 2, ... until it
1014 returns None. The completion should begin with 'text'.
1015
1016 Note that both the text and the line_buffer are optional, but at least
1015 Note that both the text and the line_buffer are optional, but at least
1017 one of them must be given.
1016 one of them must be given.
1018
1017
General Comments 0
You need to be logged in to leave comments. Login now