From 63ba660178a17d1ded6e84039f7615dee81ed10f Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dolsen@gentoo.org>
Date: Wed, 7 Mar 2018 23:15:27 +0000
Subject: [PATCH] dev-python/requests-toolbelt: Version bump

Restrict tests due to known python2.7 test failures.
Upstream not testing against newer requests versions.

bug: https://bugs.gentoo.org/635824
Upstream patch submitted: https://github.com/requests/toolbelt/pull/212
Upstream bug: https://github.com/requests/toolbelt/issues/213

Package-Manager: Portage-2.3.13, Repoman-2.3.3
---
 dev-python/requests-toolbelt/Manifest         |  1 +
 ...uests-toolbelt-0.8.0-test-tracebacks.patch | 25 ++++++++++++
 .../requests-toolbelt-0.7.1.ebuild            |  3 +-
 .../requests-toolbelt-0.8.0.ebuild            | 40 +++++++++++++++++++
 4 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 dev-python/requests-toolbelt/files/requests-toolbelt-0.8.0-test-tracebacks.patch
 create mode 100644 dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild

diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index c33f3d97bb55..38e0d6c28e43 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -1,3 +1,4 @@
 DIST requests-toolbelt-0.5.1.tar.gz 187981 BLAKE2B 1e3cfafd8e0b8625dc92ff40bf88d9cf67d40a679eef8c6825de032d51107d2486aed34611818a3b97c286ea9e452ad3b196a8ba7a4b7f57a9377366991d33a3 SHA512 fff70b7262efae616fe9fe8e25af9856d42ccecdaca71cfde0dd81c5d7c509aec30f7c99f4b886d844c168937197ed8287e873fffe6073e93e48412b5a902997
 DIST requests-toolbelt-0.7.0.tar.gz 194062 BLAKE2B ea7120e58ea23dbe1d17bc2f8c346ec00bd00d62a4c8fdefa1490b9b3ed62a0dcf45ce60b071fcbc7e510d943ec4f10a7031525bd24f5fb02749125cbccc9f0b SHA512 77f11d12643d7cacf0c5dab5c5490359fc6f11c038d56d6ae27939394c5788622edb230d38d2202192eec6a7b1229feeb5669cd6a33c78f6891699d017e8205e
 DIST requests-toolbelt-0.7.1.tar.gz 194670 BLAKE2B 3f8b5950d3a87f519f40e2d21bce13ba2d3ed205b5d7f4fa0872339df391e5477f262b104697b264a75783d686eb44231ff2943bfe56f13695d63869227c48c5 SHA512 2559db13054c4d9b7c459603809a16d8d9a9c1a348369e1bc68e557bae10c41291286112e3b4a71e83b42203d40fa5cbc8441028693eeb986162d212a65f68ac
+DIST requests-toolbelt-0.8.0.tar.gz 196129 BLAKE2B 435059ff2879c44a274641c49adae9986c761fcabe567826454d3f055db7e3e5c95905f1d178dcb37e2173bf856a9fb168a856c1301026e8c5d0de6cafb4be51 SHA512 71a4ed8961b742cb1b5b0deec7f9052a2a177d2ed6e4f13ebe22b56b7f1b6b1bad2736f1640c8b41398b082eddc1c1205f0c446602d979d5bf370fb0e10ecc88
diff --git a/dev-python/requests-toolbelt/files/requests-toolbelt-0.8.0-test-tracebacks.patch b/dev-python/requests-toolbelt/files/requests-toolbelt-0.8.0-test-tracebacks.patch
new file mode 100644
index 000000000000..ddc7b3b05a24
--- /dev/null
+++ b/dev-python/requests-toolbelt/files/requests-toolbelt-0.8.0-test-tracebacks.patch
@@ -0,0 +1,25 @@
+From 7af2e4ce4192dfab6bd8315ad31b5b689386a0d3 Mon Sep 17 00:00:00 2001
+From:  <@υ>
+Date: Wed, 7 Mar 2018 21:52:25 +0000
+Subject: [PATCH] threaded/tread.py: Fix numerous test failures
+
+---
+ requests_toolbelt/threaded/thread.py | 2 ++
+ 1 file changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/requests_toolbelt/threaded/thread.py b/requests_toolbelt/threaded/thread.py
+index 542813c..f33b759 100644
+--- a/requests_toolbelt/threaded/thread.py
++++ b/requests_toolbelt/threaded/thread.py
+@@ -36,6 +36,8 @@ class SessionThread(object):
+             self._jobs.task_done()
+ 
+     def _make_request(self):
++        if self._jobs is None:
++            return
+         while True:
+             try:
+                 kwargs = self._jobs.get_nowait()
+--
+libgit2 0.24.6
+
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.7.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.7.1.ebuild
index a41831f89e14..d4454f5e676c 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.7.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.7.1.ebuild
@@ -27,5 +27,6 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS.rst HISTORY.rst README.rst )
 
 python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
+	py.test -v || die "Tests failed with ${EPYTHON}"
 }
+
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
new file mode 100644
index 000000000000..67f4e2b6abf5
--- /dev/null
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A utility belt for advanced users of python-requests"
+HOMEPAGE="https://toolbelt.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/betamax[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst HISTORY.rst README.rst )
+PATCHES=(
+	"${FILESDIR}/requests-toolbelt-0.8.0-test-tracebacks.patch"
+)
+
+# Known python2.7 test failures do to upstream 
+# not testing with newer requests versions
+# bug: https://bugs.gentoo.org/635824
+# https://github.com/requests/toolbelt/issues/213
+RESTRICT=test
+
+python_test() {
+	py.test -v || die "Tests failed with ${EPYTHON}"
+}
-- 
2.26.2