Restore python2.6 support.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 57 insertions, 14 deletions

diff --git a/dev-python/requests/ChangeLog b/dev-python/requests/ChangeLog
index 4e884e89f094..096f87f2b60e 100644
--- a/dev-python/requests/ChangeLog
+++ b/dev-python/requests/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/requests
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.13 2012/07/17 19:28:59 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.14 2012/08/17 17:31:06 floppym Exp $
+
+  17 Aug 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/requests-0.13-python2.6.patch, requests-0.13.1.ebuild:
+  Restore python2.6 support.
 
 *requests-0.13.1 (17 Jul 2012)
 
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 4572ba278134..8c33bc32a96c 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX requests-0.12.1-setup.py.patch 1112 SHA256 2d7ce770c980b21f6e19f50916fb046ba4c30d51df8e39d67de8690b3f0c36a7 SHA512 48025d13611208736d0b24e96e37b5424bfe41366fa3e12b4b1444395918c2ae5e9106e58da93fd4d3fcb9c1916940d9ddb8858ee242dbf71e4ba28c55bdb43a WHIRLPOOL 189e5a6e3ca178bc41ea1a543295b422c4162cc2a211d7c2b7ebc56fe88da149225cab293aecea05cd1d8cd7d4d3f400d822b3d61560734a1576ec6806f59b25
+AUX requests-0.13-python2.6.patch 1765 SHA256 eef2282997f16309d8be932e2a5c6c65c5c00edc54c8f65d39047fb5ff849af8 SHA512 1ce57f185959d6105800fded764c61b644c7c7d31e2aec2a285906b6c8f889d9b343b6bb5b858d6741b4f8ef22b9f9179f7d34c822ef3c621100ffc2bb25a6a9 WHIRLPOOL 3bb75aa333c0638cb79c4b84652a443b6f69f12b7bb2992483e82e0654e47eb4dca2a8a8753c9beb7837ad8c2c1e4e4300934049d1a48bde12215a6421cff924
 DIST requests-0.10.6.tar.gz 61673 SHA256 31134b4f35951730dcce59f2af334478b68caa5728902a1d6bd5e115ec677d8b SHA512 707c2bd2e55f0ee5f64d29a07db020340dbee6e29c1e1b45951edd3c5a7030ba8e1eb8e7724d9968f955336c48312bd4b7a6beaf6b0fd9b838023485838d1f53 WHIRLPOOL 5e365de8862bd8cbe6f6bd311a96b5870c42ba5c8c9b8f5e9e7852d74dfd1e9365ec2892d5e1f9ca77d08e7e3cc9f23a4d43d403e63b187d257afa58ec824130
 DIST requests-0.11.1.tar.gz 63100 SHA256 fd4260541d0e559c78e2b3072bd79f36e0f8ef935bcbbadaa8c98cd8b5a62897 SHA512 dc480a40328ff8ab194fc76993706e4f76f23feb49624245eb201004ab4bda9ffa09cd3f707bacf38c136c7d13b144a4f6073b4acf48b1c2659c07286354a599 WHIRLPOOL 9cdaad12df14e0b35f312364eb93cd19d886dc7ca45fa07e8e374b4097448d3fd9e1fbeb84cb4f0a288eaa7cedbe0676d4e0f8f97836aab57e868ae56284dc40
 DIST requests-0.12.1.tar.gz 78245 SHA256 9ce56b87180c06728d96ca734055675abf8f5cc3136e0d7712a6260430685589 SHA512 f42c0c14ba1691698ca4a231bd01428e6ab4160fa0af4891c712b1ea7c5e74eb93caf7344636688fc1421d6cc8b6f990ed4ff1f888e08918950d43f6ab62334c WHIRLPOOL bbb6de7adc65996fc2a4c3a8da3f18ef270c37e760828600069424f1b1a2f933429d89b17d64434ce672706537ffb8ddf11f1f9ecc69232ba71770bb90e1b687
@@ -10,17 +11,13 @@ EBUILD requests-0.10.6.ebuild 659 SHA256 4e676ffb94562f888011141ba8b402c53296a80
 EBUILD requests-0.11.1.ebuild 659 SHA256 3fe01c9e03151c272e1ca8a905009e74544812e5847a2d5cfb95f6075bd9c48d SHA512 51c72f41eeff7ca9bdb98f9c2257c85f5c65bcaf268e916acff3c43a437cdcd1c54fd31203e65189072f378169f51a1bd99510682c58644ed84746db72a03836 WHIRLPOOL 8b350f48eced6833d956d8c4a8fcbc66100648e99c8a0a57cc57477ceaea3401e348329f2b807fba1bd1744aa5d8a723b548a5c1c16907f5aecab8091227ac10
 EBUILD requests-0.12.1-r1.ebuild 1034 SHA256 8f751a08068a57dbb24a8f500bab7e2d48c00ca59629b730ee4bfcada11fc5e0 SHA512 b6b69213ed223ef9a852e582bd94a8f7c943aadaba399c296c3eb9f7e9897fce36446a62bacfe5a73ccc0fc67db2a92e33a1629a12f49e0ca9ec6e231b13689e WHIRLPOOL d47c560797a1d68723f1454b7709918f3593f6f7388849d51175f6a6f453a6bc23ce7c1daba6fba3d77b2cd850415d0d40b92e2cfa6b8df9d94e62cf5361475a
 EBUILD requests-0.12.1.ebuild 746 SHA256 d78d3b7d4793bb300e07eaee306d6880a8ccf735cb29a46d1ace558b19e5ba2c SHA512 2c7393c21a7d1bd3fd424c7f7c2ee7044cd1dadce4d7afc3188f7e72000c2a17f4fa49a3182b53029384d0229f909b31e6bc8c3a473e6dfe7fee98b3c51b3bb2 WHIRLPOOL 9d95f9d73ddb1ab351b34dddd603748789ff63c24be649e7dce8411105e2adc1ba0448fa6b89d57f213d965b5de72969f0ad7717d7088fb7c3faf9099a1ab8d1
-EBUILD requests-0.13.1.ebuild 892 SHA256 d7e4254cfe07de30f76640427667e60235c1858ddb76543b58ba6997772bf860 SHA512 fa058c077efb41ea1c807af3d9a591f95e919d5fdaf654de4da2c7fd5a3846372897bb16566bc0c2c257a94165ecb7386f7f54b76f142053e6ed9ebfbcf2bf71 WHIRLPOOL 37822b3ec07e21fec4b800d0a6162a2a11f1ba805424e710cabfd53159b81768351db26732bffd3170045f5f3a2ce6d8131b377f8e0f875de1b44055907cdf57
-MISC ChangeLog 2524 SHA256 fd89ef2783425b417c390722c29051755b8c320670ed7858d55f150d9add0814 SHA512 69f60bfe374d227ff2f345cbfbcda72085b22bcc94baf5c70a1c5a90a621cdd3e28117637482c2f51f5150e2b06899f5ae0641685e3e759c4853cfcae5e7586c WHIRLPOOL d3deba49fa2029adb4ccb133f6d40876b3d24232282dad730efece0f92f99ad4439311551b115d108623f06675575f7ed510377b53d2074a111b4bfd951313a8
+EBUILD requests-0.13.1.ebuild 934 SHA256 8aa786433ea97f6f7ad9e1b8367da28b90becb470818f7e24bf25aa90ea6aca7 SHA512 4b854baa18529193fdf9dfaf1adf9c9a973d822f668f6d560a710242029b0dcc57fb8445dda3a8511184c3618d4c122b1b57174b0c8e39bb83cf0c89f4a11f32 WHIRLPOOL 2db1689f4fdcd0d53fbf6ae74cadac32b072ac2d7e59e7bb797623b6bbd0c8248bed2c46ea674f1f361102d6acb08b7d3fe2e61b43ad9f8f089e20ec7a132945
+MISC ChangeLog 2664 SHA256 26703da14eab461d203688208eec56f0b676f137454e37a200979715d36ea1cf SHA512 40c6a6ab86a9ecac35b1ea1021b3fad30ce9e545a3cf8b4d5cfea1f0a59eb57ffca2da412f846469ab89227f3422806f318042cf1bb434dfe7a8d9fc5a201b84 WHIRLPOOL 3901cad0268c7a768ff4e0d5853f25d7090315c359e85ae60a81e22c2639d224bc31d8818a61a864fe5f684d7e39ee4bcb7758b6964ef4e3f4d6268f1d01bb6a
 MISC metadata.xml 231 SHA256 7bbca8901dd0afb4da18f659567071156f1efea52100213d20d43e53721a0ff9 SHA512 dce3df6bc1c4fc9517e39c41e0c904f39fd092cd63024f03ee5c15aef5b4840dfb265ebe565a5e5a8da9a8805d58b3ec3f772429bf00b125c3172f2f79e089bb WHIRLPOOL 2f6573a3f74f88a549a3344deeea5cdd4f27a310b59d466684902f009c7b404c0557f26f416b450f1f7bdce133c3d52897c5169fce01707233630ddfa783d9c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJQBbz2AAoJEMbwO6tnXQ0sbOgH/2rbRjWG7c2jGy4+xWDGuqd7
-t7Ebtmnhwj6pv8lLeR0vbHFidgl37F5jBqDlqBkATRGF3wQj66TkCcOmB6lW4OjS
-SiVdlVxgEMHAK51+qjbCb/src55v5jd759ilWZ6KqoIzC1BrY2lLgIqUyoDrtGyP
-ykPKYLz9ItVNMci2jT7kcrbnvg6uj5SuXnp1JfAP6p5SVKUda51trd/sgTJ2NQVy
-hdh8W7ZChdPpJABsnagMCmgRF9tMUTETRxfwRU/Oy1TPI0VD7QIqWUq67qxaLE/a
-aHDoZWjpBjIdO2egDtaSP8vZcGiZ1BPyFydNeJhQ3wFKVgFS5IbNuCRrsdTi7io=
-=8rcF
+iF4EAREIAAYFAlAuf+AACgkQC77qH+pIQ6QwMwD6AuKUl+R1V2IGIvSQHlerlCDm
+HtzgJY86zrVdnYKgOrcA/3R1FnOaXVYlroxvHfEXlzrNYhNooTGPy1hYK+yUQLHD
+=TJyA
 -----END PGP SIGNATURE-----
diff --git a/dev-python/requests/files/requests-0.13-python2.6.patch b/dev-python/requests/files/requests-0.13-python2.6.patch
new file mode 100644
index 000000000000..fa6b68722ec6
--- /dev/null
+++ b/dev-python/requests/files/requests-0.13-python2.6.patch
@@ -0,0 +1,41 @@
+From 4da4792844017b7b7e5f78cf106e34a68a08af96 Mon Sep 17 00:00:00 2001
+From: Radomir Stevanovic <radomir.stevanovic@gmail.com>
+Date: Fri, 10 Aug 2012 17:51:01 +0200
+Subject: [PATCH] tests: python2.6 compat (`assertIn` added in 2.7)
+
+---
+ tests/test_requests_ext.py |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/test_requests_ext.py b/tests/test_requests_ext.py
+index 883bdce..7645d8c 100644
+--- a/tests/test_requests_ext.py
++++ b/tests/test_requests_ext.py
+@@ -110,7 +110,7 @@ def test_cookies_on_redirects(self):
+         s = requests.session()
+         s.get(url='http://tinyurl.com/preview.php?disable=1')
+         # we should have set a cookie for tinyurl: preview=0
+-        self.assertIn('preview', s.cookies)
++        self.assertTrue('preview' in s.cookies)
+         self.assertEqual(s.cookies['preview'], '0')
+         self.assertEqual(list(s.cookies)[0].name, 'preview')
+         self.assertEqual(list(s.cookies)[0].domain, 'tinyurl.com')
+@@ -118,13 +118,13 @@ def test_cookies_on_redirects(self):
+         # get cookies on another domain
+         r2 = s.get(url='http://httpbin.org/cookies')
+         # the cookie is not there
+-        self.assertNotIn('preview', json.loads(r2.text)['cookies'])
++        self.assertTrue('preview' not in json.loads(r2.text)['cookies'])
+ 
+         # this redirects to another domain, httpbin.org
+         # cookies of the first domain should NOT be sent to the next one
+         r3 = s.get(url='http://tinyurl.com/7zp3jnr')
+         assert r3.url == 'http://httpbin.org/cookies'
+-        self.assertNotIn('preview', json.loads(r2.text)['cookies'])
++        self.assertTrue('preview' not in json.loads(r2.text)['cookies'])
+ 
+ if __name__ == '__main__':
+     unittest.main()
+-- 
+1.7.10
+
diff --git a/dev-python/requests/requests-0.13.1.ebuild b/dev-python/requests/requests-0.13.1.ebuild
index a73a0f6bb287..cc697bb821d1 100644
--- a/dev-python/requests/requests-0.13.1.ebuild
+++ b/dev-python/requests/requests-0.13.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.13.1.ebuild,v 1.1 2012/07/17 19:28:59 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.13.1.ebuild,v 1.2 2012/08/17 17:31:06 floppym Exp $
 
 EAPI="4"
-PYTHON_DEPEND="*:2.7"
+PYTHON_DEPEND="*:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 2.6"
+RESTRICT_PYTHON_ABIS="2.4 2.5"
 DISTUTILS_SRC_TEST="nosetests"
 
 inherit distutils eutils
@@ -27,4 +27,5 @@ RDEPEND="app-misc/ca-certificates
 src_prepare() {
 	# Fix up dependencies (gentoo-specific), see patch for details
 	epatch "${FILESDIR}/${PN}-0.12.1-setup.py.patch"
+	epatch "${FILESDIR}/${PN}-0.13-python2.6.patch"
 }