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

Package-Manager: portage-2.1.11.40/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 67 insertions, 8 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/Manifest b/dev-python/pytest/Manifest
index 9567206a9517..6ed3645f8a85 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pytest-2.3.4-unicode.patch 1911 SHA256 ea68abe871bf27579bc5fc5e29dcc0317e1f9073e8afe5bfa7088293ac2dbb41 SHA512 9133cabe8a4872aca698dbb84df0baffe11f79f0b85882cf75738d691915ffb367f39a25d721ee155696978dc137329d5c4bf2093d71c1003c550a36d61ee353 WHIRLPOOL 267817e2b09865002683a1f5660bbc5a147f0eb268662608a8a70e7690bc8ce22ac55e10b120a85103f3286f38841572617dce9ee1efde6b52711df4c92bfd83
 DIST pytest-2.0.2.zip 256675 SHA256 9b29dc0f81c7fcba3ce5154408e948d783e35ace39b514f093f2b83bcf35c48f SHA512 c7ff534fc31bc13f297ed054a058e25ec9a7c1fd544af7599854ab4496a2470e51bb3f3261cda65868fa51543074b9e664e7ed54b037f6b69e38dd66d27b4f27 WHIRLPOOL 87421887fdb24b1c52e92b7da7b88da1d30868d4f655a0ab770c03f89e86602bc00cfe314328cf6f512a7709c64778ab2427d66e54a21b862acdd2c5bef31961
 DIST pytest-2.0.3.zip 259712 SHA256 b387aaae6df6be8a37f4e9ffcb2ca04836f5b130c11f1297f93f487a3261e692 SHA512 dbd2b82f18cb3c74cee82fd989ca8feb65ece60fd7087e084b61fcca2bda8bdadbcc06a72c592be9684878917937de96a742fb6b1bb1672c133bde11e3f7d815 WHIRLPOOL efe3eb0c3b3f7c2478ac24ec5d52ebaf93d071c07fdae466c1ca9e13e5c3620ca35aeece0e6a51c5343a8a17f36acc552b10b06f12be426f39c938c0dfebc72d
 DIST pytest-2.1.1.zip 288420 SHA256 80a3837db680adbafd23e0005d40d781153dd1e8ec62ee406d50911ed0874155 SHA512 6193fb3ee49ce69583d0a61e804919b65f827149750903e258e946a379511f5e88357e95e239b7ae7a774e4da9b9d336c90d511f52bee790c535c2a0cdb58c3f WHIRLPOOL 078b020454f3f7d9e2407eb6c11b1da8440e1e8bdc9edec148ac112cf1b83c7c40e2f250bf18395fcec28c69d7d60f2f6587fdc4980d7a8c4ea241a9ba17f57d
@@ -17,13 +18,13 @@ EBUILD pytest-2.2.4.ebuild 1381 SHA256 876d12e0af87849db6c8cb5c6506343975f527cc4
 EBUILD pytest-2.3.2-r1.ebuild 1904 SHA256 47d394c63b3cd2f9982f8816ee30d589a21fceaa523add1d7c6bc3e3aa0fd4ff SHA512 0d3221e6b17051eb14c037685735051637fdba8291173bf2703370632ea3ead242002b726a17314e4da72950e971f20ab376b9248b60c7211b2d83fe3ea7d834 WHIRLPOOL eab220df628d2a3cc6bc318cabcc0b3d95d4aae3b91fd05f1242b388ed1db23425d05e21781f410b21392489d09d55d288aff0280ebf7ce29b933a322c323c5c
 EBUILD pytest-2.3.3-r1.ebuild 1520 SHA256 f7a9efdd1a739e60bc0959fcfeb6916838b678444b8467be91b0adae2d6bd570 SHA512 b5c455c765fae388b856c76b73cb971bfb85613475459bef04e11dda25ea020995b7fb43e8fa43418b25cfa0a2ab3e6000d76acb89c96fd86cf82cdff81f4bd1 WHIRLPOOL d9ac85e754b9ca3ca6e70f96b7f0e8476c92799c4516a9ba3203b38c0daa066deb5f2652fce6ee356c52dc775b729d4b994d7a1f7d8ff5299e21958440ac094e
 EBUILD pytest-2.3.3.ebuild 1901 SHA256 fd7b9f428d53998cfbceae6384c3e251f2209859333fa0401b4cb9df22b2b68d SHA512 55a04ca4014d2814b79703d57084a6c897320a5856445476751b4fc4d97bd585f3f5996d1e8ed7ce13a23444f5e2938427bfaa5545d864034251ab0752c04e99 WHIRLPOOL 4bc8c9388544340eb5702212901a1e6e2f20c62bdc524bbf5fcd5eac30ecb8a151bdd074e8a4901e036c03ecc55eed688e91919e0a14b718a2c85cd4ebfbbd25
-EBUILD pytest-2.3.4.ebuild 1522 SHA256 89ae970a3130d5fa2c61b1a32c292ed1c52f1c5cd49328d50c08e690e5774ccc SHA512 2ac98ea3b7d00aadaadff0f067d9423f344072d0d2ba14ea6787c31b559e3bd3b1f5ea9bfc2b4d3962c0bfbbcb455779fe5ccb38a45c9547c9d3c3bc686c0c34 WHIRLPOOL 56e4ebe2a0c3e1a53b222347b21f1225679adaea28487c3c235c45602aaec75ba0fa14ee9976d96660ac0cdaf45fc200469ec1986fab6b87e0524be114d09cc4
-MISC ChangeLog 5846 SHA256 48b2d8b02a92d1331be9676c98bc3b093adf9afab23c27302cac1ff4ab694d21 SHA512 5da1b890b91b8bba2259dd7c8eb740315f4ff408165c3b9a4b12d69dc2e7cf225bc4c0ee1f1e2b6cdbfe232ab4e93dd40f07f4b6130e6aef2f3c9fc95044ce7a WHIRLPOOL 524b69668c714ed3ba13a13efca588d466a0284d7d01ab9825f08317157212861a4d8403904e351d2a70448a104b5ab4e1e07efd6edae73575acf2e3905c00bd
+EBUILD pytest-2.3.4.ebuild 1571 SHA256 fce9e51fdaf9c1965f802b866a2be974a5ac7acf2010de9df50d1cfd300595b8 SHA512 d4b16a8d32b81649724efb28ad682e3d682cb59820d50abed44b626a06eb570c86cd2c94d0a08ae3b52ee2496103650996480c643c59f4bfd83513be160e429b WHIRLPOOL bdf0de6be7d728f3113c32d49965a61947c55a50d2d654f35707ee8658a53ef5cf0818c37b8288ca40f85bedfd240dceb3545df33c99b07ed6cd0d0781a4b698
+MISC ChangeLog 6048 SHA256 6cd02c8952e7c6a5021d9a3a5e1c6aae0952bc4f4361760d6ea327def4824c2e SHA512 76a570c66f5534d1e0f2765473b24a22807fedea0818fadc9d5b529ed371dae4351e6ba217a049b28565e76c85fd5d443096153d392b78383f0761737822e7db WHIRLPOOL 8c0ff2cf8e5b69f72983b162885a60031042e0775399b2edbc33986e406dbbfd22d57fc1b82a2dabaf2cb76522ac402448ac468bb6babd05896686e5ea35e6ea
 MISC metadata.xml 229 SHA256 d84d28d5adf361bcc2b76c4b2c47920c5b06472add64c47c790522f180f93dce SHA512 9ad7198911f7c6318bcca718f8ab1d436ea14df3edefab5d5b20e36f9ab2c06f3d7d1d3a89ace9b6485b36a93bae88db28d443f51a375c8c2b8f4fe750657139 WHIRLPOOL 0aa5c9b1a9e5f07dfff7cd90a8ecb9ba54820d13261b822a8978492ff3a22369d27cafae2f772f76aac0f55f42e4b636b7c5190677eb6404be6002782ee79925
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDjuEoACgkQC77qH+pIQ6TlrwD/bjVfqVA/RWlxGV+MYW6kbVix
-tc7gfsLtOW6wptWO0PkA/jEEBY4WD+bdpJxSeuesnAHTWROfhjN1qHcifrCmVFBw
-=hQKA
+iEYEAREIAAYFAlEccQsACgkQso7CE7gHKw0FrACgwJztLqo3PBJycrwhx1QUlLRI
+S9gAn2iTMyjJIn4WI/tOnjFV2i1P8GBI
+=nWs8
 -----END PGP SIGNATURE-----
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() {