diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-04-05 21:07:43 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-04-05 21:07:43 +0000 |
| commit | 04e13499088e3b10e479d46296fe351d706db8ae (patch) | |
| tree | 9531d456aaebe166867a0b116cc2db551511bea5 /dev-python/cherrypy | |
| parent | Fix improper suggestions to put unsupported implmentations in USE_PYTHON, bug... (diff) | |
| download | gentoo-2-04e13499088e3b10e479d46296fe351d706db8ae.tar.gz gentoo-2-04e13499088e3b10e479d46296fe351d706db8ae.tar.bz2 gentoo-2-04e13499088e3b10e479d46296fe351d706db8ae.zip | |
Fix test failure in python2.6.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python/cherrypy')
| -rw-r--r-- | dev-python/cherrypy/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/cherrypy/cherrypy-3.2.5.ebuild | 6 | ||||
| -rw-r--r-- | dev-python/cherrypy/files/cherrypy-3.2.5-issue1234.patch | 10 |
3 files changed, 20 insertions, 2 deletions
diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog index ed74f820edef..5e252db0bd5a 100644 --- a/dev-python/cherrypy/ChangeLog +++ b/dev-python/cherrypy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/cherrypy # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.59 2014/04/05 17:07:00 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.60 2014/04/05 21:07:43 floppym Exp $ + + 05 Apr 2014; Mike Gilbert <floppym@gentoo.org> + +files/cherrypy-3.2.5-issue1234.patch, cherrypy-3.2.5.ebuild: + Fix test failure in python2.6. *cherrypy-3.2.5 (05 Apr 2014) diff --git a/dev-python/cherrypy/cherrypy-3.2.5.ebuild b/dev-python/cherrypy/cherrypy-3.2.5.ebuild index 02dd27cf4a43..f1e6adcc7660 100644 --- a/dev-python/cherrypy/cherrypy-3.2.5.ebuild +++ b/dev-python/cherrypy/cherrypy-3.2.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.5.ebuild,v 1.1 2014/04/05 17:07:00 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.5.ebuild,v 1.2 2014/04/05 21:07:43 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy pypy2_0 ) @@ -25,6 +25,10 @@ S="${WORKDIR}/${MY_P}" DISTUTILS_IN_SOURCE_BUILD=1 +PATCHES=( + "${FILESDIR}"/cherrypy-3.2.5-issue1234.patch +) + python_prepare_all() { # Prevent interactive failures (hangs) in the test suite sed -i -e "s/interactive = True/interactive = False/" cherrypy/test/webtest.py || die diff --git a/dev-python/cherrypy/files/cherrypy-3.2.5-issue1234.patch b/dev-python/cherrypy/files/cherrypy-3.2.5-issue1234.patch new file mode 100644 index 000000000000..fd76c5e9cb36 --- /dev/null +++ b/dev-python/cherrypy/files/cherrypy-3.2.5-issue1234.patch @@ -0,0 +1,10 @@ +https://bitbucket.org/cherrypy/cherrypy/issue/1234 + +--- cherrypy/test/test_tools.py ++++ cherrypy/test/test_tools.py +@@ -407,4 +407,4 @@ + sa = cherrypy.lib.cptools.SessionAuth() + res = sa.login_screen(None, username=unicodestr('nobody'), + password=unicodestr('anypass')) +- self.assertIsInstance(res, bytestr) ++ self.assertTrue(isinstance(res, bytestr)) |