Add simultaneous support for Werkzeug 2 and 3

This is the follow-up for PR #1356. (cherry picked from commit 860c82b)
gnocchixyz · Mar 15, 2024 · 74934e6 · 74934e6
1 parent 75a87ea
commit 74934e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/gnocchi/rest/auth_helper.py b/gnocchi/rest/auth_helper.py
@@ -121,7 +121,12 @@ def get_current_user(request):
         hdr = request.headers.get("Authorization")
         auth_hdr = (hdr.decode('utf-8') if isinstance(hdr, bytes)
                     else hdr)
-        auth = werkzeug.http.parse_authorization_header(auth_hdr)
+
+        try:
+            auth = werkzeug.http.parse_authorization_header(auth_hdr)
+        except AttributeError:
+            auth = werkzeug.datastructures.Authorization.from_header(auth_hdr)
+
         if auth is None:
             api.abort(401)
         return auth.username

diff --git a/setup.cfg b/setup.cfg
@@ -42,7 +42,7 @@ install_requires =
     stevedore
     ujson
     voluptuous>=0.8.10
-    werkzeug<3.0.0
+    werkzeug
     trollius; python_version < '3.4'
     tenacity>=5.0.0
     WebOb>=1.4.1