Fix test failure in python2.6.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 26 insertions, 7 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/Manifest b/dev-python/cherrypy/Manifest
index 29d4660d04db..2f11d23ff80e 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cherrypy-3.2.5-issue1234.patch 394 SHA256 4869b0228c93f926b980129927476701f2332dfad6241c47309d5ee73cf6f6e6 SHA512 57992292b66d019dbbfcaaa5bc025fed2fbb2c5e3e4af44404165f68ad01f0679ac4710527cf397d67ae6f93b55beca53d68de511599ba668d1741e3a11c9dc2 WHIRLPOOL 5601d8a0a4db9fde661088c64a2a1cd89f98e630ae92d0fa6ecac53aeebc121162ee46d70af7ba9a4e8683fad4d710697ff06e7cab7913060197a55ea63a4b59
 DIST CherryPy-2.3.0.tar.gz 241999 SHA256 a41e1b31ab723f50223b303991bb4e1a420a05deb2f4ab923a2ceadece4854cf SHA512 71359ff92354abc7c2156d0f66e361c16b145180e04bb14c9bb2ebae474de6a3c8a3b266363dd6df370c21b559112cbe122fcdf08d68f03f755000bb8ca4eca8 WHIRLPOOL a74b3fff30c776fb51f0dcec97e7f4e676a60a2791901ebf037abaf0e3cc59598b985e467dbabf712af013da8ca77c1925e6b53d65e523f7d535e8ecdcd6213a
 DIST CherryPy-3.1.2.tar.gz 319196 SHA256 0dfd65507b047d54c09849e7a4b8bdd3616fa8776a5dbff7697cbf6ea1559bf6 SHA512 968b1c7caa64a47d4e998083ca829fdb700b904eb243e0785e1cf490e034f4e883bbfe29680430ecc9c8000beec2c46b3fe24061e8d5e22aab666b5fe86e3ca6 WHIRLPOOL ef6349d26da654c11e0097be5f71cff79cfa21b81ed1f1e15d9c3f5dcc983d8a605a21a9cf6e34ab49160a1cb1b31ac6c2fff967be06a78c501289f80dd0977c
 DIST CherryPy-3.2.0.tar.gz 921937 SHA256 0a70d163ee33b892df064ab70d097d0fc125c74fc0c6da418b2964bb1d6d18fe SHA512 3cdf8b65b819d1c3af08c68e12e8c972ba1c313432cb0c822993cb7f14dd8544a73e778a3fcc956667da1c51d224b4561f354a03eeba371d54cdea5369f5a27d WHIRLPOOL bb4c9858e45e0d44fc56446c1820dca0c0bf87b8ce133f6d158fe48b74afd3fb594ee8bd98dfca36cc6719efb6e896cf9f616433459acb379a12d0e32e0eb146
@@ -13,13 +14,13 @@ EBUILD cherrypy-3.2.0.ebuild 1504 SHA256 b79ffc0ddf8b6d7f47bf615db1fee128241ccc4
 EBUILD cherrypy-3.2.1.ebuild 1275 SHA256 e1571688f70795fbeb1180953523fd149f0334d528c6849dbbb93e6956d23247 SHA512 3d50ac9fd26c19ab75c4121f05dd844c9c52aa5b549aadebec12d1b87dadd723674b70b60b77ab5e2583b2f911011bb69c5cf990dc76ccce5301b238a96f5e01 WHIRLPOOL c8b4449b912e6df19bf104264e4d99b8c415a5a5302657d97d87b9206374ce68db9cefb8f02f4422528316370930863a3fe25bc61a58c11eb5aad30fba973075
 EBUILD cherrypy-3.2.2-r1.ebuild 1605 SHA256 c1ac12f4fc778ebd720b713cabacf37053c3c847df441aaea66a64a01e378e33 SHA512 15793c963118e71c3c15771c54f8b8b7ea23d723e42a4d787af570ce5bb3e499e0d58d2df99f462b4d87da51c21be4db9e23375e17728bf45a6a43a5001a90ca WHIRLPOOL 3fe040d7d7aae6305052791253667d2bfc49ad3f33bf208688e868b94dcb63bda93421a20a8942a7a7f5f4a5c0a22483255d87472a2b90ab8af3d1a15e25dab5
 EBUILD cherrypy-3.2.2.ebuild 1233 SHA256 f6552d3bd15783bcd4c69633702295271191ae840282511fd9e3140836ebf72b SHA512 91d76de71c9032a88df0b5a90e4f4a69b9438923326e8bc252f5368267de02dca89cc3da121951a15837c2393debb6cc5aab1dbdb51f347b6f03f9bc11d7577f WHIRLPOOL ab078a8354bf20788191ee340e3f5638d690bd6077d89a57b031383d0482f9ce980d8b61e4e596384a435f275aba6eaa456ed2af87909131f3a5c51f0fc90cf6
-EBUILD cherrypy-3.2.5.ebuild 1353 SHA256 ac71b2c290ae93e738c05e1d81974af2f848c332126b7a2ea5c187dabafc76f4 SHA512 8ddfb1f8330f07ef94dc06c8f3931fe56e4b1ba867b906f1e9315f441598e2c97e0d375bdd3b86cc3fba3ed9f5bd2bad2b306bc44a25c4d57f738000d87a254e WHIRLPOOL abbcedb6ed633aa26a40c5f86074aa428395ece69ddbc86747e10c2c108354bae0c34668c6a2cd946277449e4245825162a19aeb7bba98e9208a4437d68fefd3
-MISC ChangeLog 9223 SHA256 191ec9f37e9adf4a61c74ab6caced35c44615e5dc0c734f911c2b6d6f0d491a2 SHA512 ed7888eb24955f42bd4c91eea19002509f955e3f254cf8a9cdeba1fd9398656dee6e9c51410d669c8204dee360870dd3cbf754b386f377bc95379518b4d61055 WHIRLPOOL d00a86bf8477aed409f6e84b2b169ce038e05a745e626ed892aefb80ac12e5f79941c9c84924d77c529dedb860d594fd7f9f357df8c775e7eadc91243d265635
+EBUILD cherrypy-3.2.5.ebuild 1412 SHA256 825d9e2a5db765050b1eb19ea78d036ab53c8f78698da6ebc0a45b5fb87913b6 SHA512 ca391abdf2acdd5cafc59653f1b32d278d248f81752e5fa86a961301ee341086e6c55c42fe1b7a22bc90fea313a99192c75a9ebf7f82285dae6fe4aa7aa50e82 WHIRLPOOL 701fcc6b2f0b844b5dc9adb465e97f57700f585898482a7f9c5dd8261eefa27d872341b9d4ffd48670821a52e2b17ad29ec2638f7fb0e193504751e95c55f2f7
+MISC ChangeLog 9370 SHA256 c74a8114f5c34566d2dac22bf88f19c8c0d69d2760c49807c610aeb6c06bd9a1 SHA512 05bd3a9568078f94341524290bac031bac444a2b19cd43262b11c109b8e945119904663871db372160c834ccca585d616dde0031772b325d2cd30f8efc0d79ff WHIRLPOOL 6c34023d95ab12f4129b82936ae98f9d8c8ec8fae05bcfcf0411ebdad86fa807f73489dfd8c8775cd9d39ec52eb4fb11be35c287f0e7d14e07bfb6d619427e17
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNAODYACgkQC77qH+pIQ6TjnwD/XNMyfTCUY3xX1lreNX1NGNPr
-IEeyRaJ6rv92qGcO7jQA/jw0HLkjBr1oXE9COc91q61P3DP8qrJgnie++sQegwix
-=TAao
+iF4EAREIAAYFAlNAcKEACgkQC77qH+pIQ6TyHAEAlptArk6ZmRVr0344r6ErVyPB
+twC/cBsM9TQMITOdakcA/0FkcRi5iLlubnGcT/nOFecg2WXQbxC13qF38TMg4vHW
+=6tJ0
 -----END PGP SIGNATURE-----
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))