diff options
| author | xmo-odoo <xmo-odoo@users.noreply.github.com> | 2014-05-19 10:18:27 +0200 |
|---|---|---|
| committer | xmo-odoo <xmo-odoo@users.noreply.github.com> | 2014-05-19 10:18:27 +0200 |
| commit | 072485799c87d45c460c7aa76fb2f0e7be1b82ef (patch) | |
| tree | 53f5a222bcf648aa54ac417bae0d4bd5049da17f | |
| parent | 59101be73b1a1b32b8732a80927305e28f828b9a (diff) | |
| parent | b1dfb8e1936d26e0776e59dfab4383457ba19939 (diff) | |
Merge pull request #27 from lyinfo/master-ck-match
Dereferencing of nones could lose error messages during import
| -rw-r--r-- | openerp/osv/orm.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 65fcd68c7c3..ea52c6cc7a0 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -5217,7 +5217,7 @@ def convert_pgerror_23502(model, fields, info, e): m = re.match(r'^null value in column "(?P<field>\w+)" violates ' r'not-null constraint\n', str(e)) - field_name = m.group('field') + field_name = m and m.group('field') if not m or field_name not in fields: return {'message': unicode(e)} message = _(u"Missing required value for the field '%s'.") % field_name @@ -5232,7 +5232,7 @@ def convert_pgerror_23502(model, fields, info, e): def convert_pgerror_23505(model, fields, info, e): m = re.match(r'^duplicate key (?P<field>\w+) violates unique constraint', str(e)) - field_name = m.group('field') + field_name = m and m.group('field') if not m or field_name not in fields: return {'message': unicode(e)} message = _(u"The value for the field '%s' already exists.") % field_name |