diff options
| author | Xavier Morel <xmo@odoo.com> | 2020-01-29 09:12:11 +0000 |
|---|---|---|
| committer | Xavier Morel <xmo@odoo.com> | 2020-02-04 12:42:35 +0000 |
| commit | de590816d8d06730d99499db9a068f8d0e2cd3f9 (patch) | |
| tree | a138df14693c2f76614e76cd26a8fcf34d0df631 /odoo/addons/base | |
| parent | eae19fc2cd3496d4b59e4d8029fcceb5eaa3a561 (diff) | |
[FIX] *: deprecated access to url_ utilities through werkzeug root
In 0.15 accessing werkzeug.urls functions directly through werkzeug
is deprecated, the shortcut will be removed in the eventual werkzeug
1.0.
Fix existing uses of these shortcuts. Also cleanup some imports when
they're not far from a werkzeug* import being altered.
Diffstat (limited to 'odoo/addons/base')
| -rw-r--r-- | odoo/addons/base/models/ir_ui_view.py | 4 | ||||
| -rw-r--r-- | odoo/addons/base/models/res_bank.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/odoo/addons/base/models/ir_ui_view.py b/odoo/addons/base/models/ir_ui_view.py index f2662bc040c..73a4ea9cae1 100644 --- a/odoo/addons/base/models/ir_ui_view.py +++ b/odoo/addons/base/models/ir_ui_view.py @@ -16,7 +16,7 @@ import uuid from dateutil.relativedelta import relativedelta from difflib import HtmlDiff -import werkzeug +import werkzeug, werkzeug.urls from lxml import etree from lxml.etree import LxmlError from lxml.builder import E @@ -1595,7 +1595,7 @@ actual arch. debug=request.session.debug if request else '', test_mode_enabled=bool(config['test_enable'] or config['test_file']), json=json_scriptsafe, - quote_plus=werkzeug.url_quote_plus, + quote_plus=werkzeug.urls.url_quote_plus, time=time, datetime=datetime, relativedelta=relativedelta, diff --git a/odoo/addons/base/models/res_bank.py b/odoo/addons/base/models/res_bank.py index 4b212f5bb08..be7b8245ca8 100644 --- a/odoo/addons/base/models/res_bank.py +++ b/odoo/addons/base/models/res_bank.py @@ -132,7 +132,7 @@ class ResPartnerBank(models.Model): if comment: communication = (comment[:137] + '...') if len(comment) > 140 else comment qr_code_string = 'BCD\n001\n1\nSCT\n%s\n%s\n%s\nEUR%s\n\n\n%s' % (self.bank_bic or "", self.company_id.name, self.acc_number, amount, communication) - qr_code_url = '/report/barcode/?type=%s&value=%s&width=%s&height=%s&humanreadable=1' % ('QR', werkzeug.url_quote_plus(qr_code_string), 128, 128) + qr_code_url = '/report/barcode/?' + werkzeug.urls.url_encode({'type': 'QR', 'value': qr_code_string, 'width': 128, 'height': 128, 'humanreadable': 1}) return qr_code_url def _validate_qr_code_arguments(self): |