odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] netsvc/service.model: added missing/removed unnecessary `except` clauses. 

bzr revid: vmt@openerp.com-20130225155828-a364gk3ii2prxe0b
This commit is contained in:
Vo Minh Thu 2013-02-25 16:58:28 +01:00
parent c8258999f1 e2e9c0669e
commit f1adca94c0
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openerp/netsvc.py
View File

@ -247,12 +247,16 @@ def dispatch_rpc(service_name, method, params):
log(rpc_request,logging.DEBUG, logline, replace_request_password(params), depth=1) log(rpc_request,logging.DEBUG, logline, replace_request_password(params), depth=1)
return result return result
except openerp.osv.orm.except_orm:
raise
except openerp.exceptions.AccessError: except openerp.exceptions.AccessError:
raise raise
except openerp.exceptions.AccessDenied: except openerp.exceptions.AccessDenied:
raise raise
except openerp.exceptions.Warning: except openerp.exceptions.Warning:
raise raise
except openerp.exceptions.RedirectWarning:
raise
except openerp.exceptions.DeferredException, e: except openerp.exceptions.DeferredException, e:
_logger.exception(tools.exception_to_unicode(e)) _logger.exception(tools.exception_to_unicode(e))
post_mortem(e.traceback) post_mortem(e.traceback)

1
openerp/osv/orm.py
View File

@ -59,7 +59,6 @@ from lxml import etree
import fields import fields
import openerp import openerp
import openerp.netsvc as netsvc
import openerp.tools as tools import openerp.tools as tools
from openerp.tools.config import config from openerp.tools.config import config
from openerp.tools.misc import CountingStream from openerp.tools.misc import CountingStream

5
openerp/service/model.py
View File

@ -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,9 +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:
_logger.exception("Uncaught exception")
raise
return wrapper return wrapper