diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-07-23 01:13:35 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-07-23 01:13:35 +0000 |
| commit | a6772817e6ed23368bf1e94b26b3e3242c91602e (patch) | |
| tree | 0da4ec31de5762b3b9b7497ed66bb1dd257837d2 /dev-python | |
| parent | added ahbot and improved overall built-prss. refs #243230 (diff) | |
| download | gentoo-2-a6772817e6ed23368bf1e94b26b3e3242c91602e.tar.gz gentoo-2-a6772817e6ed23368bf1e94b26b3e3242c91602e.tar.bz2 gentoo-2-a6772817e6ed23368bf1e94b26b3e3242c91602e.zip | |
Fix test_node_class_names with Python 2.6.
(Portage version: 13850-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/docutils/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/docutils/docutils-0.5.ebuild | 17 | ||||
| -rw-r--r-- | dev-python/docutils/files/docutils-0.5-test_node_class_names-python-2.6.patch | 13 |
3 files changed, 30 insertions, 7 deletions
diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog index 4302e312ea1d..77eb8ab413d3 100644 --- a/dev-python/docutils/ChangeLog +++ b/dev-python/docutils/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/docutils # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.84 2009/07/20 03:53:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.85 2009/07/23 01:13:35 arfrever Exp $ + + 23 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + docutils-0.5.ebuild, + +files/docutils-0.5-test_node_class_names-python-2.6.patch: + Fix test_node_class_names with Python 2.6. 20 Jul 2009; Jeroen Roovers <jer@gentoo.org> docutils-0.5.ebuild: Stable for HPPA (bug #278285). diff --git a/dev-python/docutils/docutils-0.5.ebuild b/dev-python/docutils/docutils-0.5.ebuild index a3662934b71d..812d443714f1 100644 --- a/dev-python/docutils/docutils-0.5.ebuild +++ b/dev-python/docutils/docutils-0.5.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.5.ebuild,v 1.2 2009/07/20 03:53:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.5.ebuild,v 1.3 2009/07/23 01:13:35 arfrever Exp $ -NEED_PYTHON=2.4 +EAPI="2" + +NEED_PYTHON="2.4" inherit distutils eutils multilib @@ -24,10 +26,10 @@ EMP=${PN}-0.3.7 GLEP_SRC=${WORKDIR}/glep-0.4-r1 -src_unpack() { - unpack ${A} +src_prepare() { + epatch "${FILESDIR}/${P}-test_node_class_names-python-2.6.patch" + # simplified algorithm to select installing optparse and textwrap - cd "${S}" epatch "${FILESDIR}"/${EMP}-extramodules.patch sed -i \ @@ -67,7 +69,10 @@ install_txt_doc() { src_test() { cd "${S}"/test - PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed" + for abi in ${ABIS_PYTHON}; do + echo -e "\e[1;34mTesting of ${CATEGORY}/${PF} for Python \e[31m${abi}\e[34m...\e[0m" + PYTHON="$(get_PYTHON ${abi})" PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed" + done } src_install() { diff --git a/dev-python/docutils/files/docutils-0.5-test_node_class_names-python-2.6.patch b/dev-python/docutils/files/docutils-0.5-test_node_class_names-python-2.6.patch new file mode 100644 index 000000000000..b55e392def58 --- /dev/null +++ b/dev-python/docutils/files/docutils-0.5-test_node_class_names-python-2.6.patch @@ -0,0 +1,13 @@ +https://svn.berlios.de/viewcvs/docutils?view=rev&revision=5599 + +--- trunk/docutils/test/test_nodes.py ++++ trunk/docutils/test/test_nodes.py +@@ -175,7 +175,7 @@ + node_class_names = [] + for x in dir(nodes): + c = getattr(nodes, x) +- if isinstance(c, ClassType) and issubclass(c, nodes.Node) \ ++ if isinstance(c, (type, ClassType)) and issubclass(c, nodes.Node) \ + and len(c.__bases__) > 1: + node_class_names.append(x) + node_class_names.sort() |