diff --git a/python-patches/0001-eventlet-worker-ALREADY_HANDLED-WSGI_LOCAL.patch b/python-patches/0001-eventlet-worker-ALREADY_HANDLED-WSGI_LOCAL.patch deleted file mode 100644 index dcc12e3b83..0000000000 --- a/python-patches/0001-eventlet-worker-ALREADY_HANDLED-WSGI_LOCAL.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b0b16462b630590f60b1c5ed0ee0bc2b7b6a5eb7 Mon Sep 17 00:00:00 2001 -From: Sergey Shepelev -Date: Thu, 6 May 2021 12:54:06 +0300 -Subject: [PATCH] eventlet worker: ALREADY_HANDLED -> WSGI_LOCAL - -Eventlet v0.30.3+ removed wsgi.ALREADY_HANDLED in favor of -`wsgi.WSGI_LOCAL.already_handled: bool` - -Sorry, this breaking change happened during only patch -version increase 0.30.2 -> 0.30.3 - -https://github.com/eventlet/eventlet/issues/543 -https://github.com/eventlet/eventlet/pull/544 -(cherry picked from commit 6a8ebb4844b2f28596ffe7421eb9f7d08c8dc4d8) ---- - gunicorn/workers/geventlet.py | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py -index ffdb206c..ea82f3d6 100644 ---- a/gunicorn/workers/geventlet.py -+++ b/gunicorn/workers/geventlet.py -@@ -17,11 +17,16 @@ else: - - from eventlet import hubs, greenthread - from eventlet.greenio import GreenSocket --from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED -+import eventlet.wsgi - import greenlet - - from gunicorn.workers.base_async import AsyncWorker - -+# ALREADY_HANDLED is removed in 0.30.3+ now it's `WSGI_LOCAL.already_handled: bool` -+# https://github.com/eventlet/eventlet/pull/544 -+EVENTLET_WSGI_LOCAL = getattr(eventlet.wsgi, "WSGI_LOCAL", None) -+EVENTLET_ALREADY_HANDLED = getattr(eventlet.wsgi, "ALREADY_HANDLED", None) -+ - - def _eventlet_socket_sendfile(self, file, offset=0, count=None): - # Based on the implementation in gevent which in turn is slightly -@@ -125,6 +130,10 @@ class EventletWorker(AsyncWorker): - patch_sendfile() - - def is_already_handled(self, respiter): -+ # eventlet >= 0.30.3 -+ if getattr(EVENTLET_WSGI_LOCAL, "already_handled", None): -+ raise StopIteration() -+ # eventlet < 0.30.3 - if respiter == EVENTLET_ALREADY_HANDLED: - raise StopIteration() - return super().is_already_handled(respiter) --- -2.17.1 - diff --git a/requirements.txt b/requirements.txt index d19d5d9759..74eac09729 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ confluent_kafka~=2.3.0 eventlet~=0.33.0 foundationdb~=6.3.15 gevent~=22.10.2 -gunicorn~=20.1.0 +gunicorn~=21.2.0 jsonschema~=4.17.3 kazoo~=2.9.0 lxml>=4.0.0