Upstream fix to unicode issue, -unicode.patch, for removal next release, fixes Bug #452580

(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

3 files changed, 61 insertions, 3 deletions

diff --git a/dev-python/pytest/ChangeLog b/dev-python/pytest/ChangeLog
index 749d69f0f6d1..405839677e20 100644
--- a/dev-python/pytest/ChangeLog
+++ b/dev-python/pytest/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pytest
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.45 2013/01/02 04:32:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.46 2013/02/13 13:09:54 idella4 Exp $
+
+  14 Feb 2013; Ian Delaney <idella4@gentoo.org>
+  +files/pytest-2.3.4-unicode.patch, pytest-2.3.4.ebuild:
+  Upstream fix to unicode issue, -unicode.patch, for removal next release, fixes
+  Bug #452580
 
   02 Jan 2013; Mike Gilbert <floppym@gentoo.org> pytest-2.3.4.ebuild:
   Add pypy2_0.
diff --git a/dev-python/pytest/files/pytest-2.3.4-unicode.patch b/dev-python/pytest/files/pytest-2.3.4-unicode.patch
new file mode 100644
index 000000000000..9925f277dc97
--- /dev/null
+++ b/dev-python/pytest/files/pytest-2.3.4-unicode.patch
@@ -0,0 +1,51 @@
+holger krekel 1677d28 issue250 unicode/str mixes in parametrization names and values now works; Wed Feb 13
+diff -ur pytest-2.3.4.orig/_pytest/python.py pytest-2.3.4/_pytest/python.py
+--- _pytest/python.py	2012-11-20 14:07:28.000000000 +0800
++++ _pytest/python.py	2013-02-14 09:55:16.369853793 +0800
+@@ -730,7 +730,7 @@
+         this_id = []
+         for nameindex, val in enumerate(valset):
+             if not isinstance(val, (float, int, str)):
+-                this_id.append(argnames[nameindex]+str(valindex))
++                this_id.append(str(argnames[nameindex])+str(valindex))
+             else:
+                 this_id.append(str(val))
+         idlist.append("-".join(this_id))
+diff -ur pytest-2.3.4.orig/testing/python/metafunc.py pytest-2.3.4/testing/python/metafunc.py
+--- testing/python/metafunc.py	2012-11-20 14:07:28.000000000 +0800
++++ testing/python/metafunc.py	2013-02-14 10:01:43.442834535 +0800
+@@ -106,6 +106,7 @@
+         assert metafunc._calls[2].id == "x1-a"
+         assert metafunc._calls[3].id == "x1-b"
+ 
++    @pytest.mark.issue250
+     def test_idmaker_autoname(self):
+         from _pytest.python import idmaker
+         result = idmaker(("a", "b"), [("string", 1.0),
+@@ -115,6 +116,9 @@
+         result = idmaker(("a", "b"), [(object(), 1.0),
+                                       (object(), object())])
+         assert result == ["a0-1.0", "a1-b1"]
++        # unicode mixing, issue250
++        result = idmaker((u"a", "b"), [({}, '\xc3\xb4')])
++        assert result == ['a0-\xc3\xb4']
+ 
+ 
+     def test_addcall_and_parametrize(self):
+diff -ur pytest-2.3.4.orig/tox.ini pytest-2.3.4/tox.ini
+--- tox.ini	2012-11-20 14:07:28.000000000 +0800
++++ tox.ini	2013-02-14 10:04:26.066826443 +0800
+@@ -50,6 +50,13 @@
+ commands=py.test --doctest-modules _pytest
+ deps=
+ 
+++[testenv:py32]
++deps=
++    :pypi:nose
++
++[testenv:py33]
++deps=
++    :pypi:nose
+ 
+ [testenv:doc]
+ basepython=python
diff --git a/dev-python/pytest/pytest-2.3.4.ebuild b/dev-python/pytest/pytest-2.3.4.ebuild
index f777412c4a3a..782ea5a52b83 100644
--- a/dev-python/pytest/pytest-2.3.4.ebuild
+++ b/dev-python/pytest/pytest-2.3.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.4.ebuild,v 1.2 2013/01/02 04:32:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.4.ebuild,v 1.3 2013/02/13 13:09:54 idella4 Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="py.test: simple powerful testing with Python"
 HOMEPAGE="http://pytest.org/ http://pypi.python.org/pypi/pytest"
@@ -31,6 +31,8 @@ python_prepare_all() {
 	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
 	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
 	distutils-r1_python_prepare_all
+
+	epatch "${FILESDIR}"/${P}-unicode.patch
 }
 
 python_compile_all() {