diff -Nru python-eventlet-0.24.1/debian/changelog python-eventlet-0.24.1/debian/changelog --- python-eventlet-0.24.1/debian/changelog 2018-12-18 19:58:36.000000000 +0000 +++ python-eventlet-0.24.1/debian/changelog 2018-12-21 14:16:24.000000000 +0000 @@ -1,3 +1,10 @@ +python-eventlet (0.24.1-0ubuntu3) disco; urgency=medium + + * d/p/0016-*.patch: Replace patch with proper fix cherry-picked from + upstream master branch (LP: #1809033). + + -- Corey Bryant Fri, 21 Dec 2018 09:16:24 -0500 + python-eventlet (0.24.1-0ubuntu2) disco; urgency=medium * d/p/0016-endheaders-py27-work-around.patch: Patch the endheaders diff -Nru python-eventlet-0.24.1/debian/patches/0016-endheaders-py27-work-around.patch python-eventlet-0.24.1/debian/patches/0016-endheaders-py27-work-around.patch --- python-eventlet-0.24.1/debian/patches/0016-endheaders-py27-work-around.patch 2018-12-18 19:58:36.000000000 +0000 +++ python-eventlet-0.24.1/debian/patches/0016-endheaders-py27-work-around.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -Description: Use of the "*" parameter is not valid for Python 2.7. - The "*" parameter specifies that parameters after it are - keyword-only parameters and may only be passed keyword - arguments. This works around the issue until upstream has - a better fix. -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1809033 -Author: Corey Bryant -Forwarded: No - ---- a/eventlet/green/http/client.py -+++ b/eventlet/green/http/client.py -@@ -1284,7 +1284,7 @@ - header = header + b': ' + value - self._output(header) - -- def endheaders(self, message_body=None, *, encode_chunked=False): -+ def endheaders(self, message_body=None, encode_chunked=False): - """Indicate that the last header line has been sent to the server. - - This method sends the request to the server. The optional message_body -@@ -1297,7 +1297,7 @@ - raise CannotSendHeader() - self._send_output(message_body, encode_chunked=encode_chunked) - -- def request(self, method, url, body=None, headers={}, *, -+ def request(self, method, url, body=None, headers={}, - encode_chunked=False): - """Send a complete request to the server.""" - self._send_request(method, url, body, headers, encode_chunked) diff -Nru python-eventlet-0.24.1/debian/patches/0016-Issue-535-use-Python-2-compatible-syntax-for-keyword.patch python-eventlet-0.24.1/debian/patches/0016-Issue-535-use-Python-2-compatible-syntax-for-keyword.patch --- python-eventlet-0.24.1/debian/patches/0016-Issue-535-use-Python-2-compatible-syntax-for-keyword.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-eventlet-0.24.1/debian/patches/0016-Issue-535-use-Python-2-compatible-syntax-for-keyword.patch 2018-12-21 14:16:24.000000000 +0000 @@ -0,0 +1,56 @@ +From 551580928797e00a94d56e0280cbdf4a33bdeea5 Mon Sep 17 00:00:00 2001 +From: nat-goodspeed +Date: Thu, 20 Dec 2018 09:39:08 -0500 +Subject: [PATCH] Issue 535: use Python 2 compatible syntax for keyword-only + args. (#536) + +* Issue #535: use Python 2 compatible syntax for keyword-only args. + +* Validate that encode_chunked is the *only* keyword argument passed. +--- + eventlet/green/http/client.py | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/eventlet/green/http/client.py b/eventlet/green/http/client.py +index 07ebccf..e4bd2ad 100644 +--- a/eventlet/green/http/client.py ++++ b/eventlet/green/http/client.py +@@ -1281,22 +1281,32 @@ class HTTPConnection: + header = header + b': ' + value + self._output(header) + +- def endheaders(self, message_body=None, *, encode_chunked=False): ++ def endheaders(self, message_body=None, **kwds): + """Indicate that the last header line has been sent to the server. + + This method sends the request to the server. The optional message_body + argument can be used to pass a message body associated with the + request. + """ ++ encode_chunked = kwds.pop('encode_chunked', False) ++ if kwds: ++ # mimic interpreter error for unrecognized keyword ++ raise TypeError("endheaders() got an unexpected keyword argument '{0}'" ++ .format(kwds.popitem()[0])) ++ + if self.__state == _CS_REQ_STARTED: + self.__state = _CS_REQ_SENT + else: + raise CannotSendHeader() + self._send_output(message_body, encode_chunked=encode_chunked) + +- def request(self, method, url, body=None, headers={}, *, +- encode_chunked=False): ++ def request(self, method, url, body=None, headers={}, **kwds): + """Send a complete request to the server.""" ++ encode_chunked = kwds.pop('encode_chunked', False) ++ if kwds: ++ # mimic interpreter error for unrecognized keyword ++ raise TypeError("request() got an unexpected keyword argument '{0}'" ++ .format(kwds.popitem()[0])) + self._send_request(method, url, body, headers, encode_chunked) + + def _set_content_length(self, body, method): +-- +2.19.1 + diff -Nru python-eventlet-0.24.1/debian/patches/series python-eventlet-0.24.1/debian/patches/series --- python-eventlet-0.24.1/debian/patches/series 2018-12-18 19:58:36.000000000 +0000 +++ python-eventlet-0.24.1/debian/patches/series 2018-12-21 14:16:24.000000000 +0000 @@ -8,4 +8,4 @@ 0013-New_test_crt.patch 0014-Fix-for-Python-3.7.patch 0015-IMPORTANT-late-import-in-use_hub-thread-race-caused-.patch -0016-endheaders-py27-work-around.patch +0016-Issue-535-use-Python-2-compatible-syntax-for-keyword.patch