##// END OF EJS Templates
Fix broken jedi auto-completion with newest jedi...
Rastislav Barlik -
Show More
@@ -1350,11 +1350,11 b' class IPCompleter(Completer):'
1350
1350
1351 try:
1351 try:
1352 # should we check the type of the node is Error ?
1352 # should we check the type of the node is Error ?
1353 from jedi.parser.tree import ErrorLeaf
1353 from parso.tree import ErrorLeaf
1354 next_to_last_tree = interpreter._get_module().tree_node.children[-2]
1354 next_to_last_tree = interpreter._get_module().tree_node.children[-2]
1355 completing_string = False
1355 completing_string = False
1356 if isinstance(next_to_last_tree, ErrorLeaf):
1356 if isinstance(next_to_last_tree, ErrorLeaf):
1357 completing_string = interpreter._get_module().tree_node.children[-2].value[0] in {'"', "'"}
1357 completing_string = next_to_last_tree.value[0] in {'"', "'"}
1358 # if we are in a string jedi is likely not the right candidate for
1358 # if we are in a string jedi is likely not the right candidate for
1359 # now. Skip it.
1359 # now. Skip it.
1360 try_jedi = not completing_string
1360 try_jedi = not completing_string
@@ -40,7 +40,7 b' if sys.version_info < (3, 3):'
40 except Exception:
40 except Exception:
41 pass
41 pass
42
42
43
43
44 error = """
44 error = """
45 IPython 6.0+ does not support Python 2.6, 2.7, 3.0, 3.1, or 3.2.
45 IPython 6.0+ does not support Python 2.6, 2.7, 3.0, 3.1, or 3.2.
46 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
46 When using Python 2.7, please install IPython 5.x LTS Long Term Support version.
@@ -185,7 +185,7 b' extras_require = dict('
185
185
186 install_requires = [
186 install_requires = [
187 'setuptools>=18.5',
187 'setuptools>=18.5',
188 'jedi>=0.10',
188 'jedi>=0.11',
189 'decorator',
189 'decorator',
190 'pickleshare',
190 'pickleshare',
191 'simplegeneric>0.8',
191 'simplegeneric>0.8',
General Comments 0
You need to be logged in to leave comments. Login now