[gentoo-commits] repo/gentoo:master commit in: dev-python/requests-toolbelt/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/requests-toolbelt/files/

[Amy Liffey]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 2882 bytes --]

commit:     e354318da4edf339aeddd872f79624f3ba6b77d4
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Sun Apr  8 13:04:47 2018 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 14:24:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e354318d

dev-python/requests-toolbelt: remove binary junk

Replaced with a 'fixed' copy from here:

https://github.com/dol-sen/toolbelt/commit/e130ad521d3b5a14cd9494213e6ca9f52d0d9a2e.patch
Closes: https://github.com/gentoo/gentoo/pull/7869

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 .../requests-toolbelt-0.8.0-test-tracebacks.patch  | 27 +++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

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
index ddc7b3b05a2..418039bc7f9 100644
--- 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
@@ -1,17 +1,31 @@
-From 7af2e4ce4192dfab6bd8315ad31b5b689386a0d3 Mon Sep 17 00:00:00 2001
-From:  <@υ\x04>
+From e130ad521d3b5a14cd9494213e6ca9f52d0d9a2e Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <brian.dolbec@sony.com>
 Date: Wed, 7 Mar 2018 21:52:25 +0000
-Subject: [PATCH] threaded/tread.py: Fix numerous test failures
+Subject: [PATCH] threaded/thread.py: Fix unhandled Nonetype job queue
 
+Adding this check and return prevents numerous test tracebacks:
+
+Exception in thread 12f554d5-f61f-44d9-bc69-023714627952:
+Traceback (most recent call last):
+  File "/usr/lib64/python3.4/threading.py", line 911, in _bootstrap_inner
+    self.run()
+  File "/usr/lib64/python3.4/threading.py", line 859, in run
+    self._target(*self._args, **self._kwargs)
+  File "/home/bdolbec/git/toolbelt/requests_toolbelt/threaded/thread.py", line 43, in _make_request
+    kwargs = self._jobs.get_nowait()
+AttributeError: 'NoneType' object has no attribute 'get_nowait'
+
+Signed-off-by: Brian Dolbec <brian.dolbec@sony.com>
+Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
 ---
  requests_toolbelt/threaded/thread.py | 2 ++
- 1 file changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 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):
+@@ -36,6 +36,8 @@ def _handle_request(self, kwargs):
              self._jobs.task_done()
  
      def _make_request(self):
@@ -20,6 +34,3 @@ index 542813c..f33b759 100644
          while True:
              try:
                  kwargs = self._jobs.get_nowait()
---
-libgit2 0.24.6
-