diff options
| author | Antonio Rojas | 2020-01-22 07:27:10 +0000 |
|---|---|---|
| committer | Antonio Rojas | 2020-01-22 07:27:10 +0000 |
| commit | 6779780f48594ecdf59c19988e9b0095d8dec771 (patch) | |
| tree | be48f82d44de3657beaec53e54de048a1b2861a0 /sagemath-ipython7.patch | |
| parent | ccac6471f3dbcb15ae09e2cbaf1046d07b97187f (diff) | |
| download | aur-6779780f48594ecdf59c19988e9b0095d8dec771.tar.gz | |
Rebase patches
Diffstat (limited to 'sagemath-ipython7.patch')
| -rw-r--r-- | sagemath-ipython7.patch | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sagemath-ipython7.patch b/sagemath-ipython7.patch index 28efd1440b6f..09830f221529 100644 --- a/sagemath-ipython7.patch +++ b/sagemath-ipython7.patch @@ -3275,22 +3275,6 @@ index ad2dba4fbc..1cd1fa7ba4 100644 """ return self._nproc -diff --git a/src/sage/parallel/use_fork.py b/src/sage/parallel/use_fork.py -index 77842ec794..2c1689bd25 100644 ---- a/src/sage/parallel/use_fork.py -+++ b/src/sage/parallel/use_fork.py -@@ -281,9 +281,9 @@ class p_iter_fork(object): - """ - import os, sys - try: -- from imp import reload -- except ImportError: - from importlib import reload -+ except ImportError: -+ from imp import reload - from sage.misc.persist import save - - # Make it so all stdout is sent to a file so it can diff --git a/src/sage/plot/graphics.py b/src/sage/plot/graphics.py index 31131ab220..bc33919835 100644 --- a/src/sage/plot/graphics.py |