From 9df3110cc7475719e80558ae972c4a3bd0fa8bac Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 19 Dec 2022 15:33:58 +0000 Subject: [PATCH] [FIX] core: fix import from werkzeug 2.2.2 In werkzeug 2.2.2, the NumberConverter class was moved in routing. Needed as Debian Bookworm provides werkzeug 2.2.2. See https://github.com/pallets/werkzeug/pull/2433 Part-of: odoo/odoo#112298 --- odoo/addons/base/models/ir_http.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/odoo/addons/base/models/ir_http.py b/odoo/addons/base/models/ir_http.py index 672f87b4a04..b89a846110b 100644 --- a/odoo/addons/base/models/ir_http.py +++ b/odoo/addons/base/models/ir_http.py @@ -18,6 +18,11 @@ import werkzeug.exceptions import werkzeug.routing import werkzeug.utils +try: + from werkzeug.routing import NumberConverter +except ImportError: + from werkzeug.routing.converters import NumberConverter # moved in werkzeug 2.2.2 + import odoo from odoo import api, http, models, tools, SUPERUSER_ID from odoo.exceptions import AccessDenied, AccessError, MissingError @@ -69,7 +74,7 @@ class ModelsConverter(werkzeug.routing.BaseConverter): return ",".join(value.ids) -class SignedIntConverter(werkzeug.routing.NumberConverter): +class SignedIntConverter(NumberConverter): regex = r'-?\d+' num_convert = int