[sagemath] 03/04: Update IPython 5.4 patch to fix some doctest failures

[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 f17e8d0f702077763d90cd220a7fae65585df1c5
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sat Jun 3 13:10:53 2017 +0200

    Update IPython 5.4 patch to fix some doctest failures
---
 debian/patches/u1-version-ipython-5.4.patch | 34 +++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/debian/patches/u1-version-ipython-5.4.patch b/debian/patches/u1-version-ipython-5.4.patch
index e4be8eb..2a95cd3 100644
--- a/debian/patches/u1-version-ipython-5.4.patch
+++ b/debian/patches/u1-version-ipython-5.4.patch
@@ -15,3 +15,37 @@ Bug: https://trac.sagemath.org/ticket/23125
              if init_code is None:
                  init_code = ['from six.moves import cPickle']
  
+--- a/src/sage/repl/configuration.py
++++ b/src/sage/repl/configuration.py
+@@ -11,7 +11,7 @@ the IPython simple prompt is being used::
+     sage: output = pexpect.run(
+     ....:     'bash -c \'echo "{0}" | sage\''.format(cmd),
+     ....: )
+-    sage: 'In [1]: [False, True]' in output
++    sage: 'sage: [False, True]' in output
+     True
+ """
+ 
+--- a/src/sage/doctest/test.py
++++ b/src/sage/doctest/test.py
+@@ -360,7 +360,7 @@ Test the ``--debug`` option::
+         s...: b = 5
+         s...: a + b
+         8
+-    In [1]:
++    s...:
+     <BLANKLINE>
+     Returning to doctests...
+     **********************************************************************
+--- a/src/sage/tests/cmdline.py
++++ b/src/sage/tests/cmdline.py
+@@ -386,7 +386,7 @@ def test_executable(args, input="", timeout=100.0, **kwds):
+         **********************************************************************
+         Previously executed commands:
+             s...: assert True == False
+-        In [1]:
++        s...:
+         <BLANKLINE>
+         Returning to doctests...
+         **********************************************************************
+

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