diff options
| author | Xavier Morel <xmo@odoo.com> | 2017-05-10 16:34:36 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@odoo.com> | 2017-05-12 16:15:40 +0200 |
| commit | 07ab8b6cd2b44aeb91dadc35adf5f4b19f1399b2 (patch) | |
| tree | e11bc7b07e68ff4ee0a07c1a786abd2f3abe27a8 /odoo/addons/base | |
| parent | 3dd3790597e84186d922b798aa8bb4650513ce4b (diff) | |
[FIX] P3: Exception.message removed
Diffstat (limited to 'odoo/addons/base')
| -rw-r--r-- | odoo/addons/base/ir/ir_model.py | 2 | ||||
| -rw-r--r-- | odoo/addons/base/ir/ir_qweb/assetsbundle.py | 4 | ||||
| -rw-r--r-- | odoo/addons/base/ir/ir_ui_view.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/odoo/addons/base/ir/ir_model.py b/odoo/addons/base/ir/ir_model.py index 2ff66b455de..374ff5edc15 100644 --- a/odoo/addons/base/ir/ir_model.py +++ b/odoo/addons/base/ir/ir_model.py @@ -406,7 +406,7 @@ class IrModelFields(models.Model): try: field = self._related_field() except UserError as e: - return {'warning': {'title': _("Warning"), 'message': e.message}} + return {'warning': {'title': _("Warning"), 'message': e}} self.ttype = field.type self.relation = field.comodel_name self.readonly = True diff --git a/odoo/addons/base/ir/ir_qweb/assetsbundle.py b/odoo/addons/base/ir/ir_qweb/assetsbundle.py index 19902e78d1b..6a8ad84c9dd 100644 --- a/odoo/addons/base/ir/ir_qweb/assetsbundle.py +++ b/odoo/addons/base/ir/ir_qweb/assetsbundle.py @@ -524,7 +524,7 @@ class JavascriptAsset(WebAsset): try: return super(JavascriptAsset, self)._fetch_content() except AssetError as e: - return "console.error(%s);" % json.dumps(e.message) + return "console.error(%s);" % json.dumps(str(e)) def to_html(self): if self.url: @@ -573,7 +573,7 @@ class StylesheetAsset(WebAsset): return content except AssetError as e: - self.bundle.css_errors.append(e.message) + self.bundle.css_errors.append(str(e)) return '' def minify(self): diff --git a/odoo/addons/base/ir/ir_ui_view.py b/odoo/addons/base/ir/ir_ui_view.py index 0a709985ff6..3e674b02a48 100644 --- a/odoo/addons/base/ir/ir_ui_view.py +++ b/odoo/addons/base/ir/ir_ui_view.py @@ -1200,4 +1200,4 @@ actual arch. try: self.browse(vid)._check_xml() except Exception as e: - self.raise_view_error("Can't validate view:\n%s" % (e.message or repr(e)), vid) + self.raise_view_error("Can't validate view:\n%s" % e, vid) |