svn commit: r562034 - in head/devel/ipython: . files

[Ruslan Makhmatkhanov]

Author: rm
Date: Tue Jan 19 08:35:04 2021
New Revision: 562034
URL: https://svnweb.freebsd.org/changeset/ports/562034

Log:
  devel/ipython: add upstream fix
  
  Autocompletion is broken in ipython, that is currently in ports.
  Add adopted upstream commit to resolve the issue.
  
  Reference:
  https://github.com/ipython/ipython/issues/12740
  
  With hat:	python

Added:
  head/devel/ipython/files/
  head/devel/ipython/files/patch-autocompletion-fix   (contents, props changed)
Modified:
  head/devel/ipython/Makefile

Modified: head/devel/ipython/Makefile
==============================================================================
--- head/devel/ipython/Makefile	Tue Jan 19 07:56:49 2021	(r562033)
+++ head/devel/ipython/Makefile	Tue Jan 19 08:35:04 2021	(r562034)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ipython
 PORTVERSION=	7.19.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Added: head/devel/ipython/files/patch-autocompletion-fix
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ipython/files/patch-autocompletion-fix	Tue Jan 19 08:35:04 2021	(r562034)
@@ -0,0 +1,74 @@
+From dcd9dc90aee7e4c5c52ce44c18e7518934790612 Mon Sep 17 00:00:00 2001
+From: gorogoroumaru <force.minpiku at gmail.com>
+Date: Fri, 10 Apr 2020 10:24:52 +0900
+Subject: [PATCH] Fix DeprecationWarning on autocompletion with jedi 0.17.0
+
+---
+ IPython/core/completer.py | 19 +++++++++----------
+ 1 file changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/IPython/core/completer.py b/IPython/core/completer.py
+index 16fbb81f55..01730fff2d 100644
+--- IPython/core/completer.py
++++ IPython/core/completer.py
+@@ -110,26 +110,23 @@
+ # Copyright (C) 2001 Python Software Foundation, www.python.org
+ 
+ 
+-import __main__
+ import builtins as builtin_mod
+ import glob
+-import time
+ import inspect
+ import itertools
+ import keyword
+ import os
+ import re
++import string
+ import sys
++import time
+ import unicodedata
+-import string
+ import warnings
+-
+ from contextlib import contextmanager
+ from importlib import import_module
+-from typing import Iterator, List, Tuple, Iterable
+ from types import SimpleNamespace
++from typing import Iterable, Iterator, List, Tuple
+ 
+-from traitlets.config.configurable import Configurable
+ from IPython.core.error import TryNext
+ from IPython.core.inputtransformer2 import ESC_MAGIC
+ from IPython.core.latex_symbols import latex_symbols, reverse_latex_symbol
+@@ -137,7 +134,10 @@
+ from IPython.utils import generics
+ from IPython.utils.dir2 import dir2, get_real_method
+ from IPython.utils.process import arg_split
+-from traitlets import Bool, Enum, observe, Int
++from traitlets import Bool, Enum, Int, observe
++from traitlets.config.configurable import Configurable
++
++import __main__
+ 
+ # skip module docstests
+ skip_doctest = True
+@@ -1380,8 +1380,7 @@ def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str):
+                 else:
+                     raise ValueError("Don't understand self.omit__names == {}".format(self.omit__names))
+ 
+-        interpreter = jedi.Interpreter(
+-            text[:offset], namespaces, column=cursor_column, line=cursor_line + 1)
++        interpreter = jedi.Interpreter(text[:offset], namespaces)
+         try_jedi = True
+ 
+         try:
+@@ -1408,7 +1407,7 @@ def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str):
+         if not try_jedi:
+             return []
+         try:
+-            return filter(completion_filter, interpreter.completions())
++            return filter(completion_filter, interpreter.complete(column=cursor_column, line=cursor_line + 1))
+         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))]