changeset 2132304259ee in trytond:default
details: https://hg.tryton.org/trytond?cmd=changeset&node=2132304259ee
description:
Add support for werkzeug 2.0
issue10086
review337571002
diffstat:
CHANGELOG | 1 +
setup.py | 2 +-
trytond/protocols/wrappers.py | 14 +++++++-------
3 files changed, 9 insertions(+), 8 deletions(-)
diffs (73 lines):
diff -r 2571dac54624 -r 2132304259ee CHANGELOG
--- a/CHANGELOG Fri May 21 00:27:55 2021 +0200
+++ b/CHANGELOG Fri May 28 09:10:15 2021 +0200
@@ -1,3 +1,4 @@
+* Add support for werkzeug 2.0
* Combine search and get_keys in DictSchemaMixin
* Make language code unique
* Support base64 encoded data in ModelStorage.import_data
diff -r 2571dac54624 -r 2132304259ee setup.py
--- a/setup.py Fri May 21 00:27:55 2021 +0200
+++ b/setup.py Fri May 28 09:10:15 2021 +0200
@@ -162,7 +162,7 @@
'python-dateutil',
'polib',
'python-sql >= 0.5',
- 'werkzeug < 2',
+ 'werkzeug',
'wrapt',
'passlib >= 1.7.0',
],
diff -r 2571dac54624 -r 2132304259ee trytond/protocols/wrappers.py
--- a/trytond/protocols/wrappers.py Fri May 21 00:27:55 2021 +0200
+++ b/trytond/protocols/wrappers.py Fri May 28 09:10:15 2021 +0200
@@ -12,7 +12,6 @@
from http import client as HTTPStatus
from werkzeug.wrappers import Request as _Request, Response
-from werkzeug.http import wsgi_to_bytes, bytes_to_wsgi
from werkzeug.datastructures import Authorization
from werkzeug.exceptions import abort, HTTPException
@@ -113,7 +112,8 @@
def parse_authorization_header(value):
if not value:
return
- value = wsgi_to_bytes(value)
+ if not isinstance(value, bytes):
+ value = value.encode('latin1')
try:
auth_type, auth_info = value.split(None, 1)
auth_type = auth_type.lower()
@@ -127,9 +127,9 @@
except Exception:
return
return Authorization('session', {
- 'username': bytes_to_wsgi(username),
+ 'username': username.decode("latin1"),
'userid': userid,
- 'session': bytes_to_wsgi(session),
+ 'session': session.decode("latin1"),
})
@@ -214,16 +214,16 @@
pool = Pool()
UserApplication = pool.get('res.user.application')
- authorization = wsgi_to_bytes(request.headers['Authorization'])
+ authorization = request.headers['Authorization']
try:
auth_type, auth_info = authorization.split(None, 1)
auth_type = auth_type.lower()
except ValueError:
abort(HTTPStatus.UNAUTHORIZED)
- if auth_type != b'bearer':
+ if auth_type != 'bearer':
abort(HTTPStatus.FORBIDDEN)
- application = UserApplication.check(bytes_to_wsgi(auth_info), name)
+ application = UserApplication.check(auth_info, name)
if not application:
abort(HTTPStatus.FORBIDDEN)
transaction = Transaction()