Merge pull request #141 from anarkiwi/ev2

Upgrade eventlet.
faucetsdn · May 31, 2021 · f24e2b9 · f24e2b9
2 parents 2eae521 + dfe583b
commit f24e2b9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/ryu/app/wsgi.py b/ryu/app/wsgi.py
@@ -108,8 +108,15 @@ def __call__(self, ws):
 
 class _AlreadyHandledResponse(Response):
     # XXX: Eventlet API should not be used directly.
-    from eventlet.wsgi import ALREADY_HANDLED
-    _ALREADY_HANDLED = ALREADY_HANDLED
+    # https://github.com/benoitc/gunicorn/pull/2581
+    from packaging import version
+    import eventlet
+    if version.parse(eventlet.__version__) >= version.parse("0.30.3"):
+        import eventlet.wsgi
+        _ALREADY_HANDLED = getattr(eventlet.wsgi, "ALREADY_HANDLED", None)
+    else:
+        from eventlet.wsgi import ALREADY_HANDLED
+        _ALREADY_HANDLED = ALREADY_HANDLED
 
     def __call__(self, environ, start_response):
         return self._ALREADY_HANDLED

diff --git a/tools/pip-requires b/tools/pip-requires
@@ -2,11 +2,12 @@
 # NOTE: OpenStack avoids some versions of eventlet, because of the
 # following issue.
 # https://github.com/eventlet/eventlet/issues/401
-eventlet==0.30.1
+eventlet==0.31.0
 msgpack>=0.4.0  # RPC library, BGP speaker(net_cntl)
 netaddr
 oslo.config>=2.5.0
 ovs>=2.6.0  # OVSDB
+packaging==20.9
 routes  # wsgi
 six>=1.4.0
 tinyrpc==1.0.4  # RPC library, BGP speaker(net_cntl)