[sagemath] 01/01: Add a future patch needed for IPython 5.4

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository sagemath.

commit fc81a7825924ee8119b0abdf9a766a601d8cc1d6
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Jun 2 00:43:18 2017 +0200

    Add a future patch needed for IPython 5.4
---
 debian/patches/series                       |  2 ++
 debian/patches/u1-version-ipython-5.4.patch | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index d62d58b..4a4ff80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,6 +15,8 @@ u1-pip-nowarn.patch                        #21835
 u1-fix-atrocious-symlink-logic.patch       #22444
 u1-looser-doctest-basename.patch           #22445
 u1-scripts-dir.patch                       #22731
+# Not yet in Debian, uncomment when it is:
+#u1-version-ipython-5.4.patch              #23125
 u1-ipywidgets-repr.patch                   #https://github.com/jupyter-widgets/ipywidgets/pull/1031
 
 # Patches that should be upstreamed (may need some work first)
diff --git a/debian/patches/u1-version-ipython-5.4.patch b/debian/patches/u1-version-ipython-5.4.patch
new file mode 100644
index 0000000..e4be8eb
--- /dev/null
+++ b/debian/patches/u1-version-ipython-5.4.patch
@@ -0,0 +1,17 @@
+Description: Update to IPython 5.4
+ I updated IPython 5.4's simple-prompt to use the application's configured
+ prompt rather than a hard-coded "In [xxx]" but Sage still expects the latter.
+Author: Ximin Luo <infinity0 at debian.org>
+Bug: https://trac.sagemath.org/ticket/23125
+
+--- a/src/sage/interfaces/sage0.py
++++ b/src/sage/interfaces/sage0.py
+@@ -160,7 +160,7 @@ class Sage(ExtraTabCompletion, Expect):
+                 '--no-term-title',
+                 '--simple-prompt',
+             ])
+-            prompt = re.compile('In \[\d+\]: ')
++            prompt = re.compile('sage: ') # needs to match SagePrompts
+             if init_code is None:
+                 init_code = ['from six.moves import cPickle']
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git