[MERGE] netsvc/service.model: added missing/removed unnecessary `except` clauses.
bzr revid: vmt@openerp.com-20130225155828-a364gk3ii2prxe0b
This commit is contained in:
commit
f1adca94c0
|
@ -247,12 +247,16 @@ def dispatch_rpc(service_name, method, params):
|
|||
log(rpc_request,logging.DEBUG, logline, replace_request_password(params), depth=1)
|
||||
|
||||
return result
|
||||
except openerp.osv.orm.except_orm:
|
||||
raise
|
||||
except openerp.exceptions.AccessError:
|
||||
raise
|
||||
except openerp.exceptions.AccessDenied:
|
||||
raise
|
||||
except openerp.exceptions.Warning:
|
||||
raise
|
||||
except openerp.exceptions.RedirectWarning:
|
||||
raise
|
||||
except openerp.exceptions.DeferredException, e:
|
||||
_logger.exception(tools.exception_to_unicode(e))
|
||||
post_mortem(e.traceback)
|
||||
|
|
|
@ -59,7 +59,6 @@ from lxml import etree
|
|||
|
||||
import fields
|
||||
import openerp
|
||||
import openerp.netsvc as netsvc
|
||||
import openerp.tools as tools
|
||||
from openerp.tools.config import config
|
||||
from openerp.tools.misc import CountingStream
|
||||
|
|
|
@ -98,8 +98,6 @@ def check(f):
|
|||
if openerp.pooler.get_pool(dbname)._init:
|
||||
raise openerp.exceptions.Warning('Currently, this database is not fully loaded and can not be used.')
|
||||
return f(dbname, *args, **kwargs)
|
||||
except except_orm:
|
||||
raise
|
||||
except IntegrityError, inst:
|
||||
osv_pool = openerp.pooler.get_pool(dbname)
|
||||
for key in osv_pool._sql_error.keys():
|
||||
|
@ -127,9 +125,6 @@ def check(f):
|
|||
raise openerp.osv.orm.except_orm(_('Integrity Error'), msg)
|
||||
else:
|
||||
raise openerp.osv.orm.except_orm(_('Integrity Error'), inst[0])
|
||||
except Exception:
|
||||
_logger.exception("Uncaught exception")
|
||||
raise
|
||||
|
||||
return wrapper
|
||||
|
||||
|
|
Loading…
Reference in New Issue