diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-04-04 18:24:34 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-04-04 18:24:34 +0000 |
| commit | 996551dce04f4332150c4b1ebb009a2d6247b1ed (patch) | |
| tree | c716b53f9c1d91d2266314abcca7f7a55f3df5fd /dev-python | |
| parent | sci-chemistry/nmrglue: New addition (diff) | |
| download | gentoo-2-996551dce04f4332150c4b1ebb009a2d6247b1ed.tar.gz gentoo-2-996551dce04f4332150c4b1ebb009a2d6247b1ed.tar.bz2 gentoo-2-996551dce04f4332150c4b1ebb009a2d6247b1ed.zip | |
Fix python3.2 SyntaxError introduced by 'unicode' patch. Bug 462552.
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/pytest/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pytest/files/pytest-2.3.4-unicode.patch | 2 | ||||
| -rw-r--r-- | dev-python/pytest/pytest-2.3.4-r1.ebuild | 14 |
3 files changed, 9 insertions, 13 deletions
diff --git a/dev-python/pytest/ChangeLog b/dev-python/pytest/ChangeLog index 044a4cddafa4..a685579b3349 100644 --- a/dev-python/pytest/ChangeLog +++ b/dev-python/pytest/ChangeLog @@ -1,6 +1,10 @@ # 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.59 2013/04/04 12:38:16 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.60 2013/04/04 18:24:34 floppym Exp $ + + 04 Apr 2013; Mike Gilbert <floppym@gentoo.org> + files/pytest-2.3.4-unicode.patch, pytest-2.3.4-r1.ebuild: + Fix python3.2 SyntaxError introduced by 'unicode' patch. Bug 462552. *pytest-2.3.4-r1 (04 Apr 2013) diff --git a/dev-python/pytest/files/pytest-2.3.4-unicode.patch b/dev-python/pytest/files/pytest-2.3.4-unicode.patch index a23bf55cfc4f..c384c67d6ed3 100644 --- a/dev-python/pytest/files/pytest-2.3.4-unicode.patch +++ b/dev-python/pytest/files/pytest-2.3.4-unicode.patch @@ -27,7 +27,7 @@ diff -ur pytest-2.3.4.orig/testing/python/metafunc.py pytest-2.3.4/testing/pytho (object(), object())]) assert result == ["a0-1.0", "a1-b1"] + # unicode mixing, issue250 -+ result = idmaker((u"a", "b"), [({}, '\xc3\xb4')]) ++ result = idmaker((py.builtin._totext("a"), "b"), [({}, '\xc3\xb4')]) + assert result == ['a0-\xc3\xb4'] diff --git a/dev-python/pytest/pytest-2.3.4-r1.ebuild b/dev-python/pytest/pytest-2.3.4-r1.ebuild index af2b05f401a1..28fc05b2fc21 100644 --- a/dev-python/pytest/pytest-2.3.4-r1.ebuild +++ b/dev-python/pytest/pytest-2.3.4-r1.ebuild @@ -1,6 +1,6 @@ # 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-r1.ebuild,v 1.1 2013/04/04 12:38:16 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.4-r1.ebuild,v 1.2 2013/04/04 18:24:34 floppym Exp $ EAPI="5" @@ -18,7 +18,7 @@ IUSE="doc test" # When bumping, please check setup.py for the proper py version PY_VER="1.4.12" -RDEPEND=">=dev-python/py-${PY_VER}" +RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} app-arch/unzip dev-python/setuptools[${PYTHON_USEDEP}]" @@ -43,15 +43,7 @@ python_compile_all() { } python_test() { - cd "${BUILD_DIR}"/lib/ || die - # pytest.py draws from "${S}" if / when absent of a local testing folder; Bug 462552 - if [[ "${EPYTHON:6:1}" == 3 ]]; then - cp -a "${S}"/testing/ . || die - "${PYTHON}" pytest.py || die "tests failed with ${EPYTHON}" - rm -rf testing/ - else - "${PYTHON}" pytest.py || die "tests failed with ${EPYTHON}" - fi + "${PYTHON}" pytest.py || die "tests failed with ${EPYTHON}" } python_install_all() { |