diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-08-06 18:29:20 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-08-06 18:48:24 +0200 |
| commit | 7d04dc1c7c51dfd18951912628b14bee446a2b01 (patch) | |
| tree | e89601e493bea092239df55a5ef406b2e05d7d7b /addons/web/controllers/main.py | |
| parent | b091014686d86ad793e2d1cbf0e7ffea8fbde361 (diff) | |
| parent | 9e74730a26b09fa4e516bc0d76550f7c7c502fac (diff) | |
[MERGE] forward port branch saas-12.2 up to 9e74730a26b
Diffstat (limited to 'addons/web/controllers/main.py')
| -rw-r--r-- | addons/web/controllers/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 9d95ae485a9..0f0bf9da958 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -198,11 +198,11 @@ def concat_xml(file_list): :param list(str) file_list: list of files to check :returns: (concatenation_result, checksum) - :rtype: (str, str) + :rtype: (bytes, str) """ checksum = hashlib.new('sha1') if not file_list: - return '', checksum.hexdigest() + return b'', checksum.hexdigest() root = None for fname in file_list: |