##// END OF EJS Templates
Merge pull request #12488 from meeseeksmachine/auto-backport-of-pr-12207-on-7.x...
Matthias Bussonnier -
r25976:49d40334 merge
parent child Browse files
Show More
@@ -988,7 +988,8 b' def _make_signature(completion)-> str:'
988
988
989 """
989 """
990
990
991 return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for p in completion.params) if f])
991 return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for signature in completion.get_signatures()
992 for p in signature.defined_names()) if f])
992
993
993 class IPCompleter(Completer):
994 class IPCompleter(Completer):
994 """Extension of the completer class with IPython-specific features"""
995 """Extension of the completer class with IPython-specific features"""
@@ -1398,7 +1399,7 b' class IPCompleter(Completer):'
1398 if not try_jedi:
1399 if not try_jedi:
1399 return []
1400 return []
1400 try:
1401 try:
1401 return filter(completion_filter, interpreter.completions())
1402 return filter(completion_filter, interpreter.complete())
1402 except Exception as e:
1403 except Exception as e:
1403 if self.debug:
1404 if self.debug:
1404 return [_FakeJediCompletion('Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""' % (e))]
1405 return [_FakeJediCompletion('Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""' % (e))]
@@ -187,7 +187,7 b' extras_require = dict('
187
187
188 install_requires = [
188 install_requires = [
189 'setuptools>=18.5',
189 'setuptools>=18.5',
190 'jedi>=0.10',
190 'jedi>=0.16',
191 'decorator',
191 'decorator',
192 'pickleshare',
192 'pickleshare',
193 'traitlets>=4.2',
193 'traitlets>=4.2',
General Comments 0
You need to be logged in to leave comments. Login now