From 2d949cd3a882e97939046753d7aa2ef932f57db2 Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Sat, 29 Aug 2020 14:31:21 -0700 Subject: [PATCH] Revert "Backport PR #12207 on branch 7.x (Bump jedi to at least 0.16.0 and fix deprecated function usage)" --- IPython/core/completer.py | 5 ++--- setup.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/IPython/core/completer.py b/IPython/core/completer.py index 374a35d7aed..bc114f0f66b 100644 --- a/IPython/core/completer.py +++ b/IPython/core/completer.py @@ -988,8 +988,7 @@ def _make_signature(completion)-> str: """ - return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for signature in completion.get_signatures() - for p in signature.defined_names()) if f]) + return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for p in completion.params) if f]) class IPCompleter(Completer): """Extension of the completer class with IPython-specific features""" @@ -1399,7 +1398,7 @@ def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str): if not try_jedi: return [] try: - return filter(completion_filter, interpreter.complete()) + return filter(completion_filter, interpreter.completions()) except Exception as e: if self.debug: return [_FakeJediCompletion('Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""' % (e))] diff --git a/setup.py b/setup.py index df1aeb9e398..f26c588c9de 100755 --- a/setup.py +++ b/setup.py @@ -187,7 +187,7 @@ install_requires = [ 'setuptools>=18.5', - 'jedi>=0.16', + 'jedi>=0.10', 'decorator', 'pickleshare', 'traitlets>=4.2',