diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2012-09-12 12:29:13 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2012-09-12 12:29:13 +0000 |
| commit | f78102b236725e8626d05b1e014c5efa8ea90142 (patch) | |
| tree | dc86936a7a24eba98debc9e6c103c901684bdb9b /dev-python/meld3 | |
| parent | Stable for x86, wrt bug #434290 (diff) | |
| download | gentoo-2-f78102b236725e8626d05b1e014c5efa8ea90142.tar.gz gentoo-2-f78102b236725e8626d05b1e014c5efa8ea90142.tar.bz2 gentoo-2-f78102b236725e8626d05b1e014c5efa8ea90142.zip | |
Apply upstream patch to fix test failures with Python2.7. Thanks to Ian Delaney <johneed@hotmail.com> for reporting issue upstream. Fixes bug 429412 by Diego Elio Pettenò <flameeyes@gentoo.org>
(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/meld3')
| -rw-r--r-- | dev-python/meld3/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-python/meld3/files/meld3_tests.patch | 20 | ||||
| -rw-r--r-- | dev-python/meld3/meld3-0.6.8.ebuild | 13 |
3 files changed, 36 insertions, 6 deletions
diff --git a/dev-python/meld3/ChangeLog b/dev-python/meld3/ChangeLog index 1f6d2be6c825..3780e53e4cde 100644 --- a/dev-python/meld3/ChangeLog +++ b/dev-python/meld3/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/meld3 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/ChangeLog,v 1.5 2012/03/29 10:41:47 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/ChangeLog,v 1.6 2012/09/12 12:29:12 xarthisius Exp $ + + 12 Sep 2012; Kacper Kowalik <xarthisius@gentoo.org> +files/meld3_tests.patch, + meld3-0.6.8.ebuild: + Apply upstream patch to fix test failures with Python2.7. Thanks to Ian + Delaney <johneed@hotmail.com> for reporting issue upstream. Fixes bug 429412 + by Diego Elio Pettenò <flameeyes@gentoo.org> *meld3-0.6.8 (29 Mar 2012) @@ -24,4 +30,3 @@ 04 Mar 2010; Dirkjan Ochtman <djc@gentoo.org> +meld3-0.6.6.ebuild: Initial version of meld3 (dep of app-admin/supervisor). - diff --git a/dev-python/meld3/files/meld3_tests.patch b/dev-python/meld3/files/meld3_tests.patch new file mode 100644 index 000000000000..21fcd1717687 --- /dev/null +++ b/dev-python/meld3/files/meld3_tests.patch @@ -0,0 +1,20 @@ +https://github.com/Supervisor/meld3/issues/2 +https://bugs.gentoo.org/show_bug.cgi?id=429412 + +--- a/meld3/test_meld3.py ++++ b/meld3/test_meld3.py +@@ -1672,13 +1672,10 @@ class WriterTests(unittest.TestCase): + </html>""" + + def test_unknown_entity(self): +- if sys.version_info[:3] >= (2,7,0): +- self.assertRaises(SyntaxError, self._parse, +- '<html><head></head><body>&fleeb;</body></html>') +- else: +- from xml.parsers import expat +- self.assertRaises(expat.error, self._parse, +- '<html><head></head><body>&fleeb;</body></html>') ++ # exception thrown may vary by python or expat version ++ from xml.parsers import expat ++ self.assertRaises((expat.error, SyntaxError), self._parse, ++ '<html><head></head><body>&fleeb;</body></html>') diff --git a/dev-python/meld3/meld3-0.6.8.ebuild b/dev-python/meld3/meld3-0.6.8.ebuild index 9e3f3c70d619..fc79be611eba 100644 --- a/dev-python/meld3/meld3-0.6.8.ebuild +++ b/dev-python/meld3/meld3-0.6.8.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-0.6.8.ebuild,v 1.1 2012/03/29 10:41:47 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-0.6.8.ebuild,v 1.2 2012/09/12 12:29:12 xarthisius Exp $ EAPI="3" PYTHON_DEPEND="2" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="3.*" -inherit distutils +inherit distutils eutils DESCRIPTION="meld3 is an HTML/XML templating engine." HOMEPAGE="http://pypi.python.org/pypi/meld3" @@ -23,10 +23,15 @@ RDEPEND="" DOCS="CHANGES.txt COPYRIGHT.txt LICENSE.txt README.txt TODO.txt" +src_prepare() { + epatch "${FILESDIR}"/${PN}_tests.patch + distutils_src_prepare +} + src_test() { - cd meld3 + cd ${PN} testing() { - "$(PYTHON)" test_meld3.py + "$(PYTHON)" test_${PN}.py } python_execute_function testing } |