##// END OF EJS Templates
Backport PR #12227 on brnach 7.x...
gorogoroumaru -
Show More
@@ -110,26 +110,23 b' current development version to get better completions.'
110 # Copyright (C) 2001 Python Software Foundation, www.python.org
110 # Copyright (C) 2001 Python Software Foundation, www.python.org
111
111
112
112
113 import __main__
114 import builtins as builtin_mod
113 import builtins as builtin_mod
115 import glob
114 import glob
116 import time
117 import inspect
115 import inspect
118 import itertools
116 import itertools
119 import keyword
117 import keyword
120 import os
118 import os
121 import re
119 import re
120 import string
122 import sys
121 import sys
122 import time
123 import unicodedata
123 import unicodedata
124 import string
125 import warnings
124 import warnings
126
127 from contextlib import contextmanager
125 from contextlib import contextmanager
128 from importlib import import_module
126 from importlib import import_module
129 from typing import Iterator, List, Tuple, Iterable
130 from types import SimpleNamespace
127 from types import SimpleNamespace
128 from typing import Iterable, Iterator, List, Tuple
131
129
132 from traitlets.config.configurable import Configurable
133 from IPython.core.error import TryNext
130 from IPython.core.error import TryNext
134 from IPython.core.inputtransformer2 import ESC_MAGIC
131 from IPython.core.inputtransformer2 import ESC_MAGIC
135 from IPython.core.latex_symbols import latex_symbols, reverse_latex_symbol
132 from IPython.core.latex_symbols import latex_symbols, reverse_latex_symbol
@@ -137,7 +134,10 b' from IPython.core.oinspect import InspectColors'
137 from IPython.utils import generics
134 from IPython.utils import generics
138 from IPython.utils.dir2 import dir2, get_real_method
135 from IPython.utils.dir2 import dir2, get_real_method
139 from IPython.utils.process import arg_split
136 from IPython.utils.process import arg_split
140 from traitlets import Bool, Enum, observe, Int
137 from traitlets import Bool, Enum, Int, observe
138 from traitlets.config.configurable import Configurable
139
140 import __main__
141
141
142 # skip module docstests
142 # skip module docstests
143 skip_doctest = True
143 skip_doctest = True
@@ -1371,8 +1371,7 b' class IPCompleter(Completer):'
1371 else:
1371 else:
1372 raise ValueError("Don't understand self.omit__names == {}".format(self.omit__names))
1372 raise ValueError("Don't understand self.omit__names == {}".format(self.omit__names))
1373
1373
1374 interpreter = jedi.Interpreter(
1374 interpreter = jedi.Interpreter(text[:offset], namespaces)
1375 text[:offset], namespaces, column=cursor_column, line=cursor_line + 1)
1376 try_jedi = True
1375 try_jedi = True
1377
1376
1378 try:
1377 try:
@@ -1399,7 +1398,7 b' class IPCompleter(Completer):'
1399 if not try_jedi:
1398 if not try_jedi:
1400 return []
1399 return []
1401 try:
1400 try:
1402 return filter(completion_filter, interpreter.complete())
1401 return filter(completion_filter, interpreter.complete(column=cursor_column, line=cursor_line + 1))
1403 except Exception as e:
1402 except Exception as e:
1404 if self.debug:
1403 if self.debug:
1405 return [_FakeJediCompletion('Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""' % (e))]
1404 return [_FakeJediCompletion('Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""' % (e))]
General Comments 0
You need to be logged in to leave comments. Login now