From 44a679a0adc60616bd95f6322dc2c4cf0985dc8f Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 28 Sep 2024 00:09:08 +0900 Subject: [PATCH] Drop workaround for eventlet < 0.36.0 Use of the incorrect exception[1] was fixed in 0.36.0[2]. [1] https://github.com/eventlet/eventlet/issues/692 [2] https://github.com/eventlet/eventlet/commit/caf9f9983a43c537efff5c4c9ff1d543af6e1220 Change-Id: I50e74a401b66d4239468dae71e01c32caa9a8234 --- designate/cmd/__init__.py | 6 ------ requirements.txt | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/designate/cmd/__init__.py b/designate/cmd/__init__.py index 975fa9761..806716bce 100644 --- a/designate/cmd/__init__.py +++ b/designate/cmd/__init__.py @@ -14,11 +14,5 @@ # License for the specific language governing permissions and limitations # under the License. import eventlet -from eventlet.green import ssl -import socket eventlet.monkey_patch(os=False) - -# Work around the eventlet issue that impacts redis using TLS. -# https://github.com/eventlet/eventlet/issues/692 -ssl.timeout_exc = socket.timeout diff --git a/requirements.txt b/requirements.txt index b8974c885..bf30bcbf6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # date but we do not test them so no guarantee of having them all correct. If # you find any incorrect lower bounds, let us know or propose a fix. alembic>=1.8.0 # MIT -eventlet>=0.27.0 # MIT +eventlet>=0.36.0 # MIT Flask!=0.11,>=0.10 # BSD greenlet>=0.4.15 # MIT Jinja2>=2.10 # BSD License (3 clause)