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

git commit -a -mm

This commit is contained in:
Fabien Meghazi 2014-06-18 16:56:46 +02:00
parent 4c785069bc
commit fef8077df3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/addons/base/ir/ir_http.py
View File

@ -104,7 +104,7 @@ class ir_http(osv.AbstractModel):
# check authentication level # check authentication level
try: try:
auth_method = self._authenticate(func.routing["auth"]) auth_method = self._authenticate(func.routing["auth"])
except Exception, e: except Exception:
# force a Forbidden exception with the original traceback # force a Forbidden exception with the original traceback
return self._handle_exception( return self._handle_exception(
convert_exception_to( convert_exception_to(

6
openerp/http.py
View File

@ -460,10 +460,8 @@ class HttpRequest(WebRequest):
be used as response.""" be used as response."""
try: try:
return super(HttpRequest, self)._handle_exception(exception) return super(HttpRequest, self)._handle_exception(exception)
except Exception, e: except werkzeug.exceptions.HTTPException, e:
if isinstance(e, werkzeug.exceptions.HTTPException): return e
return e
raise
def dispatch(self): def dispatch(self):
# TODO: refactor this correctly. This is a quick fix for pos demo. # TODO: refactor this correctly. This is a quick fix for pos demo.