diff --git a/addons/link_tracker/models/mail_render_mixin.py b/addons/link_tracker/models/mail_render_mixin.py index 3fa3159f361b0907cfaebd8d852de6f233837a13..21ba81f4d90a4c6f9c9a69ae8815f011b17e2dda 100644 --- a/addons/link_tracker/models/mail_render_mixin.py +++ b/addons/link_tracker/models/mail_render_mixin.py @@ -3,7 +3,8 @@ import re -from werkzeug import urls, utils +from html import unescape +from werkzeug import urls from odoo import api, models, tools @@ -40,7 +41,7 @@ class MailRenderMixin(models.AbstractModel): label = (match[3] or '').strip() if not blacklist or not [s for s in blacklist if s in long_url] and not long_url.startswith(short_schema): - create_vals = dict(link_tracker_vals, url=utils.unescape(long_url), label=utils.unescape(label)) + create_vals = dict(link_tracker_vals, url=unescape(long_url), label=unescape(label)) link = self.env['link.tracker'].create(create_vals) if link.short_url: new_href = href.replace(long_url, link.short_url) @@ -69,7 +70,7 @@ class MailRenderMixin(models.AbstractModel): if blacklist and any(item in parsed.path for item in blacklist): continue - create_vals = dict(link_tracker_vals, url= utils.unescape(original_url)) + create_vals = dict(link_tracker_vals, url=unescape(original_url)) link = self.env['link.tracker'].create(create_vals) if link.short_url: content = content.replace(original_url, link.short_url, 1) diff --git a/addons/pos_mercury/models/pos_mercury_transaction.py b/addons/pos_mercury/models/pos_mercury_transaction.py index c30d0c645149dbc965f1cacfe75dba62de6b672d..23457bc025e51a5791b26fc85a1d56b25112a576 100644 --- a/addons/pos_mercury/models/pos_mercury_transaction.py +++ b/addons/pos_mercury/models/pos_mercury_transaction.py @@ -4,7 +4,8 @@ from datetime import date, timedelta import requests -import werkzeug + +from html import unescape from odoo import models, api, service from odoo.tools.translate import _ @@ -69,7 +70,7 @@ class MercuryTransaction(models.Model): try: r = requests.post(url, data=xml_transaction, headers=headers, timeout=65) r.raise_for_status() - response = werkzeug.utils.unescape(r.content.decode()) + response = unescape(r.content.decode()) except Exception: response = "timeout"