[IMP] osv: removed unnecessary `except` clauses.
bzr revid: vmt@openerp.com-20130225152057-9ehnwo2szr4pphz3
This commit is contained in:
parent
9412351315
commit
e2e9c0669e
|
@ -98,8 +98,6 @@ def check(f):
|
||||||
if openerp.pooler.get_pool(dbname)._init:
|
if openerp.pooler.get_pool(dbname)._init:
|
||||||
raise openerp.exceptions.Warning('Currently, this database is not fully loaded and can not be used.')
|
raise openerp.exceptions.Warning('Currently, this database is not fully loaded and can not be used.')
|
||||||
return f(dbname, *args, **kwargs)
|
return f(dbname, *args, **kwargs)
|
||||||
except except_orm:
|
|
||||||
raise
|
|
||||||
except IntegrityError, inst:
|
except IntegrityError, inst:
|
||||||
osv_pool = openerp.pooler.get_pool(dbname)
|
osv_pool = openerp.pooler.get_pool(dbname)
|
||||||
for key in osv_pool._sql_error.keys():
|
for key in osv_pool._sql_error.keys():
|
||||||
|
@ -127,8 +125,6 @@ def check(f):
|
||||||
raise openerp.osv.orm.except_orm(_('Integrity Error'), msg)
|
raise openerp.osv.orm.except_orm(_('Integrity Error'), msg)
|
||||||
else:
|
else:
|
||||||
raise openerp.osv.orm.except_orm(_('Integrity Error'), inst[0])
|
raise openerp.osv.orm.except_orm(_('Integrity Error'), inst[0])
|
||||||
except Exception:
|
|
||||||
raise
|
|
||||||
|
|
||||||
return wrapper
|
return wrapper
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue