[Python-modules-commits] r27157 - in packages/ipython/trunk/debian/patches (2 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Saturday, January 11, 2014 @ 15:40:51
  Author: jtaylor-guest
Revision: 27157

add an upstream patch fixing a python3.4 issue

still plenty python3.4 failures remaining, most seem to be just test
issues.

Added:
  packages/ipython/trunk/debian/patches/python3.4-fixes.patch
Modified:
  packages/ipython/trunk/debian/patches/series

Added: packages/ipython/trunk/debian/patches/python3.4-fixes.patch
===================================================================
--- packages/ipython/trunk/debian/patches/python3.4-fixes.patch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/python3.4-fixes.patch	2014-01-11 15:40:51 UTC (rev 27157)
@@ -0,0 +1,29 @@
+Description: Backport PR #4758 - fixes for Python 3.4.
+ Not complete, plenty more failures
+Author: Thomas Kluyver <takowl at gmail.com>
+Origin: 341c046c7ce22c633daf3cb12f3f439c6f376056
+
+--- a/IPython/utils/tests/test_text.py
++++ b/IPython/utils/tests/test_text.py
+@@ -15,6 +15,7 @@
+ import os
+ import math
+ import random
++import sys
+ 
+ import nose.tools as nt
+ 
+@@ -107,7 +108,12 @@ def eval_formatter_no_slicing_check(f):
+     s = f.format('{stuff[slice(1,4)]}', **ns)
+     nt.assert_equal(s, 'ell')
+     
+-    nt.assert_raises(SyntaxError, f.format, "{a[:]}")
++    if sys.version_info >= (3, 4):
++        # String formatting has changed in Python 3.4, so this now works.
++        s = f.format("{a[:]}", a=[1, 2])
++        nt.assert_equal(s, "[1, 2]")
++    else:
++        nt.assert_raises(SyntaxError, f.format, "{a[:]}")
+ 
+ def test_eval_formatter():
+     f = text.EvalFormatter()

Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series	2014-01-11 13:57:34 UTC (rev 27156)
+++ packages/ipython/trunk/debian/patches/series	2014-01-11 15:40:51 UTC (rev 27157)
@@ -8,3 +8,4 @@
 shared-static-path.patch
 no-submodule-check.patch
 test-fix.patch
+python3.4-fixes.patch