summarylogtreecommitdiffstats
path: root/sagemath-jedi-0.16.patch
diff options
context:
space:
mode:
authorAntonio Rojas2020-04-14 21:34:14 +0000
committerAntonio Rojas2020-04-14 21:34:14 +0000
commit4beae3c9cd3c6da4bb0c019d09cc78c3eec791e2 (patch)
treea764b391e86b48d5eb31538e4cfb93f5f940cfa5 /sagemath-jedi-0.16.patch
parent4f2038b18c028911646bbe84ca646f10e2ea2f2e (diff)
downloadaur-4beae3c9cd3c6da4bb0c019d09cc78c3eec791e2.tar.gz
Rebase patches, split dict sorting changes out of ipython7 patch
Diffstat (limited to 'sagemath-jedi-0.16.patch')
-rw-r--r--sagemath-jedi-0.16.patch21
1 files changed, 19 insertions, 2 deletions
diff --git a/sagemath-jedi-0.16.patch b/sagemath-jedi-0.16.patch
index 27769bdb8cfd..477091a1c007 100644
--- a/sagemath-jedi-0.16.patch
+++ b/sagemath-jedi-0.16.patch
@@ -1,6 +1,6 @@
--- a/src/sage/all.py
+++ b/src/sage/all.py
-@@ -324,6 +324,9 @@ warnings.filterwarnings('ignore', category=DeprecationWarning,
+@@ -99,6 +99,9 @@ warnings.filterwarnings('ignore', category=DeprecationWarning,
# However, be sure to keep OUR deprecation warnings
warnings.filterwarnings('default', category=DeprecationWarning,
message=r'[\s\S]*See https\?://trac\.sagemath\.org/[0-9]* for details.')
@@ -10,4 +10,21 @@
# Python 3.8 deprecation warnings
warnings.filterwarnings('ignore', category=DeprecationWarning,
message='.*PY_SSIZE_T_CLEAN.*')
-
+diff --git a/src/sage/__init__.py b/src/sage/__init__.py
+index c5ebb92..e2ae5b8 100644
+--- a/src/sage/__init__.py
++++ b/src/sage/__init__.py
+@@ -56,13 +56,3 @@ def isfunction(obj):
+
+ import inspect
+ inspect.isfunction = isfunction
+-
+-
+-# Monkey-patch ExtensionFileLoader to allow IPython to find the sources
+-# of Cython files. See https://trac.sagemath.org/ticket/24681
+-try:
+- from importlib.machinery import ExtensionFileLoader
+-except ImportError:
+- pass # Python 2
+-else:
+- del ExtensionFileLoader.get_source