dev-python/jsonpickle: Fix tests

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 72 insertions, 18 deletions

diff --git a/dev-python/jsonpickle/ChangeLog b/dev-python/jsonpickle/ChangeLog
index e357c609b0a1..0742c7126beb 100644
--- a/dev-python/jsonpickle/ChangeLog
+++ b/dev-python/jsonpickle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/jsonpickle
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpickle/ChangeLog,v 1.18 2014/02/24 08:45:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpickle/ChangeLog,v 1.19 2014/02/24 09:12:10 jlec Exp $
+
+  24 Feb 2014; Justin Lecher <jlec@gentoo.org> jsonpickle-0.6.1.ebuild,
+  +files/jsonpickle-0.6.1-drop-brocken-backend.patch,
+  +files/jsonpickle-0.6.1-test-fix-backport.patch:
+  Fix tests
 
   24 Feb 2014; Justin Lecher <jlec@gentoo.org> jsonpickle-0.6.1.ebuild:
   add py3 support
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 379ea792efe6..36bfad17d7f8 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX jsonpickle-0.6.1-drop-brocken-backend.patch 575 SHA256 e78fa083db9766508ad3158114ad4578075a0c266bcf0d9dd8a0fd4022f7fd09 SHA512 3234249ef1c8b0d83c57734162ec525aa59ebab55bc26e50efce7ee797fe04a0ea6dac03827f28cf3acb9fc87e78f6a67b5ed227a324cabacb66936a36a9f9a2 WHIRLPOOL 517c2bd5744263ce8f772021694e5d0ae261142715742576a4fe6c7ae4bf210a5a3eed94c3becdffef688e87ecc7d8cef740daa6a6b9ab3bcc2cb2b9dd038b19
+AUX jsonpickle-0.6.1-test-fix-backport.patch 870 SHA256 91fcaedf3fd76323716b7aa63498e47e4e8205744ad787b5d8908a32031d5151 SHA512 0a72827c14c3a339cb37fae5c8652df2db85623413b5fb66bb94211b1a177b53a8d294091235d532465c9c0ad677b1c1ec2fa522542e8485ac50a3192127faf4 WHIRLPOOL 50506518c20f8f5ed23b4b75e16a49dd19f808c9c28aeebcfacbb5671a872e2c4ec35f4667df69f31d24043cc98f67e047202bda616279b060bb82ed38f1d960
 DIST jsonpickle-0.4.0.tar.gz 25352 SHA256 546cd22d361ef7019f60e2fb6dd032c1e78d731fac962bda7c15806e6c0285a8 SHA512 ad572c43a0b9f2b6e3cf553c976efbe74e2667313ce52f4bdafbdf8b5c48e54633b1f707cc61bf4dfc6b2a8b531ae7d5a9810ae48901d686cd4d4accf73f0611 WHIRLPOOL 1c569ccb49fe7314991a5741f8e0320b61a2af64a602bc630b123c62be8b4125563bb2e225fe0b4f4300319d2d92f139c15d4a5c37a4ac7df4733c00a4380f8d
 DIST jsonpickle-0.6.1.tar.gz 31922 SHA256 8ede5bef60e94173c7c4bcfa3d63187d6415d2a425a1ec164687baa4d5bfb8f7 SHA512 8cf6c3a4c56c392a94b75f2fa54031e7f264f3cdafde7eeae65d76566f28736fff9a79e8b48703bdf5f39820343b8990907850fcb17c5d73ab36da594030acd2 WHIRLPOOL 3572593d5d2d29ef1fda3b4c376311b2456805decac670d779b2086ecd0949f13dd71ac647a143ec703faa4770070acf2d057b64f4b110ed414bbad51f044a0d
 EBUILD jsonpickle-0.4.0-r1.ebuild 781 SHA256 37ec0b6edf88e472cb3b280d17e5d2484a9c2bf471f9861794303a3770d1b53d SHA512 bb2836a898aaee24a852a7a02f325cff49862671cea33cf4642157e19eb9612c6185c84ae1be3290f58d1d747f837ba6a99011139e5a7ce720e981a457602518 WHIRLPOOL d5472b986e0c4e5157ab4122371494523efbd7fcf7beb6c39b6387cd873697c0e71647ead7a81621c6c2059d6af76bdb9d00aecb68291154229ba003cc728bdb
 EBUILD jsonpickle-0.4.0.ebuild 888 SHA256 e9a69f6b53b2e575c870314aea36ff5323ec1fd5e4c66bdd1e076c01cd244618 SHA512 c00294daa04de47be01f1f60b43bff31124855f17d7c682ba3b28aa598a2b6c1529693e9bdef3c337672da6d0bd73d4264b728c0a442c63afe1cf69aa9397232 WHIRLPOOL 7310e04afd24e255cb47672224cc69c9c6fd86063d9b05473e9c80503c34e8eed8e00d4a94610cb295b193944530ecdb129db0315813f68f12f0f87efa39d8b8
-EBUILD jsonpickle-0.6.1.ebuild 813 SHA256 5b82a994e28405eecd717e2e49bf842bb321efcb30bb9da6bae38f574b17758f SHA512 e46417f430f7f70e5b2767b2b4d58a44e1eff1e3388fe794c4617bffe53f0fae462345a9917cb0e028c1be1c846a7c91b7ac1f681bf2afd59854994873b35daa WHIRLPOOL ecabb64642bc67963aa2200428029a89de2ff7669dade5b234dc651b74fab0503c2d2c1e2ce185df9e9ed50fd1420c0becb34fc9dde6be9b79171125470e6a26
-MISC ChangeLog 2580 SHA256 30e3f7cad1ae9508ed4e0046ac4efc39ca43eb6b4c0d32975e3b5d41b2ecf347 SHA512 0f3021c38afcaa98ad4fbb2cace9447810a61fb3bb145358d64961aa24044ccc4eef97c6ffa78630ae11c0d00ecb3752df991752aa5226c6a57071f42e2bfb4b WHIRLPOOL 948838a24d384a2fad3e5d80df747d530e76fbe9c402f2dd734cdc5f58b5315b6807693126e69ea1e1020a325da0bbacff201c02e9ba5ec6de094711168726cd
+EBUILD jsonpickle-0.6.1.ebuild 917 SHA256 1869597eed577dc739eec27ead83331b84ccea64ee9d724f600d4b4d1f1861eb SHA512 201cd767e4e6f99e460901a846e507f8111937e07bed934379920e4384744baeca60c7ebd595dfb6ed2d8890b5a8b04fc1ed7ef8b7e5f8683677c73cf74ca793 WHIRLPOOL c9d5b347462072746de6889f6892de94ce18c1982a54229acc82fa83a5b26eb2335ab0fe47c5376961e62b1e44caae5606d5bac6a0f8c2b3732f4d3a056adb4b
+MISC ChangeLog 2770 SHA256 9e602c95215219984ee19b96fbfc9d380cc8f5fc1463a9be9ae18f6b3144e4ff SHA512 9c86a334b7916781a58598c48fffec14273dd103f3a1b6697712d355c708d159d6f299cad0dd38d62f045fe88b914e1860b48dabde586a4d982a29758ec926bb WHIRLPOOL 7cac04d97f0bdaecfb60e9525516b45c14a6beb2ce9f02bf777962a4a032a7ad6688ad180013893a08fa5cbb9dbee6b12ed79c7f4008ef652cb1c37ec46e94fc
 MISC metadata.xml 238 SHA256 f42bdbf9f8c9af22dede30f8c3a0b16ee9d196ed8d2d7ae337d20cdfbf8a3c88 SHA512 c6b78a8a76228bbfd6112bf25f68ed7d6e5cc3dff3793bb6d3e0f1528ef1028057c6af76558eaa9532a1b3863ff6f2411ceff35f910c4f85756a5a41512b6eb6 WHIRLPOOL 0b9033bd586d95333818491d964ebffa4901e1f1b211f79c9e9419831b948be5c1e8d2a6f5875dfb269dfcf869faf6d3140a3c29b35b5fba8592eb755ce690cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJTCwayXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTCwzrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir5Q0P/juZltCpRMSi+BALa86y6yDl
-eqV7HF6AThS4DnUo0OH/xV2ayXByla3qzzCXxqQ8aUdlKtIh8QxJlUjG00mCinRA
-vRt2lCNNvgzcJudKSsWr0n3JyGNHoLEw8Wnmm1umG+mQxdIwl9Hct2WV7RTHD5Wv
-1ooOd2KVfnwubhAJBB9ANiwlw9lm0hbBbwxPnjg03DmU0VUlkBSjM8sOOlBntToM
-Q0yHAt/x0V/92g4BRbnV8cTPEu/FiykOEjXngATPzfldYKBF7IY4HASNM95qslPl
-9us/tSHTY5BJRKFE0MgXdH6zLIBY9IUt+n+A1Ph6FfrYfCtBK/X2AHGzhFuEFoIH
-vUqb+VJFPZOvjNyBYc/0+HDCMgxNYPO7aVHyFhQqzHsN6r5K4fRpwwrIDQGb0rDu
-4mvqqmAbRDAzR5AYMh5+FtUvHHofndxxx4zOi2nkA3Cw7B0LjmQIhm0TQVzt7jcK
-mPZiBbjvE7cPfOagBcmYsaMKXu27wtI04qHfGZqczjLl7SdfL1r/Kd30Ry1wEdVt
-KaarAlfDaSh0Dx4kBqtgVdnl3Dsx+iOnHeiFbGX6aZ5D8/HMGkINEwQUCoaZxTkQ
-LbdiYIxEwp8CUakKphp/bUemLfiWyOx6yAcDhWcExEOZdsJVgQLYnN4NyyNNJBWK
-Oq4mgImrG0M2w1EvZjAi
-=RgbL
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir3PQQAIn4e3YDZ2MtmlbcLtvNaWr4
+D75UcwTzuWiw4OUu72GhgjpjDKHPwsTKzM7b6tVtd6qfUwwIGcBP5jHDnYM7WkYQ
+Cqxb/3Q0ZRPTH59DFSo3E/55wsaXFv+hW34jO28pvw8zCwgaeeTGGDbkc/bRYVlN
+xw19ZMMmuEl1vz8f+1aLfHFuZUf+TNnCr9UkCDBI64J8h1PcNed3HO2kdjJmRBvA
+YjcExAKKwMcuc0yOnYNSVKBoNRBz1pPz4vLW6Qklj8+t/FYzV/7TQMzfddRTgXu/
+UmE7/rIave1qZkLTOHjY2VBqUtWOkEfw7jNpk2Zytc6ekU1UAwshWqabV4peoveI
+DMHOZd7IPoW8/FXxxYvzKlkPyThGeHLDJoNRfRGK0PR6L5t8VeSoHnD11zOugIkK
+WmuvDSYiKyFKKzAfZr5mc6ko6ZAgcTTQWR2Lh9n+shVdS94n6dnFkWK+JLCALMXU
+aituYNZldHJ30ydaZ36RlLJYFg1bOmBCqgHRMO0GlIre6ksV9X5jd9aS9F/me2kG
+281ipRbNarovmuBQQsu23QjqKNq/K844U8jqERLl194nD6hcExOVZ1S6c4JM0YTW
+jYtS9Cj0f2fov7Z5MYqvJOuYfDNjqIj3qFs0y3hTv7XXo52ZryexvlXxY1GyKW27
+ZCXvDptoiGfxrxRoCTnj
+=Yf00
 -----END PGP SIGNATURE-----
diff --git a/dev-python/jsonpickle/files/jsonpickle-0.6.1-drop-brocken-backend.patch b/dev-python/jsonpickle/files/jsonpickle-0.6.1-drop-brocken-backend.patch
new file mode 100644
index 000000000000..be8dc9c26e67
--- /dev/null
+++ b/dev-python/jsonpickle/files/jsonpickle-0.6.1-drop-brocken-backend.patch
@@ -0,0 +1,15 @@
+ tests/thirdparty_tests.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/thirdparty_tests.py b/tests/thirdparty_tests.py
+index 6d2d150..f085f57 100644
+--- a/tests/thirdparty_tests.py
++++ b/tests/thirdparty_tests.py
+@@ -60,6 +60,7 @@ class FeedParserTest(unittest.TestCase):
+     def setUp(self):
+         try:
+             import feedparser
++            feedparser.PREFERRED_XML_PARSERS.remove('drv_libxml2')
+         except ImportError as e:
+             self.fail("feedparser module not available, please install")
+         self.doc = feedparser.parse(RSS_DOC)
diff --git a/dev-python/jsonpickle/files/jsonpickle-0.6.1-test-fix-backport.patch b/dev-python/jsonpickle/files/jsonpickle-0.6.1-test-fix-backport.patch
new file mode 100644
index 000000000000..e8b3f6412954
--- /dev/null
+++ b/dev-python/jsonpickle/files/jsonpickle-0.6.1-test-fix-backport.patch
@@ -0,0 +1,27 @@
+From 4302389b1e4e5ba753b2f76427408910c05f683c Mon Sep 17 00:00:00 2001
+From: David Aguilar <davvid@gmail.com>
+Date: Thu, 13 Feb 2014 13:44:01 -0800
+Subject: [PATCH] tests: replace our single use of assertEquals with
+ assertEqual
+
+Signed-off-by: David Aguilar <davvid@gmail.com>
+---
+ tests/thirdparty_tests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/thirdparty_tests.py b/tests/thirdparty_tests.py
+index 70f7f2c..b069641 100644
+--- a/tests/thirdparty_tests.py
++++ b/tests/thirdparty_tests.py
+@@ -71,7 +71,7 @@ def setUp(self):
+     def test(self):
+         pickled = jsonpickle.encode(self.doc)
+         unpickled = jsonpickle.decode(pickled)
+-        self.assertEquals(self.doc['feed']['title'], unpickled['feed']['title'])
++        self.assertEqual(self.doc['feed']['title'], unpickled['feed']['title'])
+ 
+ 
+ def suite():
+-- 
+1.8.5.5
+
diff --git a/dev-python/jsonpickle/jsonpickle-0.6.1.ebuild b/dev-python/jsonpickle/jsonpickle-0.6.1.ebuild
index 98778ce4efcd..56cb05be6945 100644
--- a/dev-python/jsonpickle/jsonpickle-0.6.1.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-0.6.1.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/jsonpickle/jsonpickle-0.6.1.ebuild,v 1.4 2014/02/24 08:45:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpickle/jsonpickle-0.6.1.ebuild,v 1.5 2014/02/24 09:12:10 jlec Exp $
 
 EAPI=5
 
@@ -23,6 +23,11 @@ DEPEND="${RDEPEND}
 		dev-python/feedparser[${PYTHON_USEDEP}]
 		dev-python/ujson[${PYTHON_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-test-fix-backport.patch
+	"${FILESDIR}"/${P}-drop-brocken-backend.patch
+)
+
 python_test() {
 	${PYTHON} tests/runtests.py || die
 }