62 lines
2.6 KiB
Diff
62 lines
2.6 KiB
Diff
From df733e90032589861d93be78e22dbafc2f1dbea4 Mon Sep 17 00:00:00 2001
|
|
From: Danil Shein <dshein@altlinux.org>
|
|
Date: Mon, 26 Sep 2022 15:26:00 +0300
|
|
Subject: [PATCH] fix Werkzeug 2.1.x compatibility
|
|
|
|
- fix httpbin/core.py: use Responce class instead of BaseResponse
|
|
see: https://github.com/pallets/werkzeug/pull/2276
|
|
- fix tests: TestClient doesn't provide 'Content-Length' header anymore
|
|
see: https://github.com/pallets/werkzeug/issues/2347
|
|
---
|
|
httpbin/core.py | 7 +++++--
|
|
test_httpbin.py | 4 ++--
|
|
2 files changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/httpbin/core.py b/httpbin/core.py
|
|
index 305c9882..d5c89eed 100644
|
|
--- a/httpbin/core.py
|
|
+++ b/httpbin/core.py
|
|
@@ -29,7 +29,10 @@
|
|
from six.moves import range as xrange
|
|
from werkzeug.datastructures import WWWAuthenticate, MultiDict
|
|
from werkzeug.http import http_date
|
|
-from werkzeug.wrappers import BaseResponse
|
|
+try:
|
|
+ from werkzeug.wrappers import Response
|
|
+except ImportError:
|
|
+ from werkzeug.wrappers import BaseResponse as Response
|
|
from werkzeug.http import parse_authorization_header
|
|
from flasgger import Swagger, NO_SANITIZER
|
|
|
|
@@ -77,7 +80,7 @@ def jsonify(*args, **kwargs):
|
|
|
|
|
|
# Prevent WSGI from correcting the casing of the Location header
|
|
-BaseResponse.autocorrect_location_header = False
|
|
+Response.autocorrect_location_header = False
|
|
|
|
# Find the correct template folder when running from a different location
|
|
tmpl_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "templates")
|
|
diff --git a/test_httpbin.py b/test_httpbin.py
|
|
index b7104ffc..87305ae6 100755
|
|
--- a/test_httpbin.py
|
|
+++ b/test_httpbin.py
|
|
@@ -148,7 +148,7 @@ def test_get(self):
|
|
data = json.loads(response.data.decode('utf-8'))
|
|
self.assertEqual(data['args'], {})
|
|
self.assertEqual(data['headers']['Host'], 'localhost')
|
|
- self.assertEqual(data['headers']['Content-Length'], '0')
|
|
+ # self.assertEqual(data['headers']['Content-Length'], '0')
|
|
self.assertEqual(data['headers']['User-Agent'], 'test')
|
|
# self.assertEqual(data['origin'], None)
|
|
self.assertEqual(data['url'], 'http://localhost/get')
|
|
@@ -162,7 +162,7 @@ def test_anything(self):
|
|
data = json.loads(response.data.decode('utf-8'))
|
|
self.assertEqual(data['args'], {})
|
|
self.assertEqual(data['headers']['Host'], 'localhost')
|
|
- self.assertEqual(data['headers']['Content-Length'], '0')
|
|
+ # self.assertEqual(data['headers']['Content-Length'], '0')
|
|
self.assertEqual(data['url'], 'http://localhost/anything/foo/bar')
|
|
self.assertEqual(data['method'], 'GET')
|
|
self.assertTrue(response.data.endswith(b'\n'))
|