git commit -a -mm

diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py
index 867abf1..122b9d9 100644 (file)
--- a/openerp/addons/base/ir/ir_http.py
+++ b/openerp/addons/base/ir/ir_http.py
@@ -104,7 +104,7 @@ class ir_http(osv.AbstractModel):
         # check authentication level
         try:
             auth_method = self._authenticate(func.routing["auth"])
-        except Exception, e:
+        except Exception:
             # force a Forbidden exception with the original traceback
             return self._handle_exception(
                 convert_exception_to(

diff --git a/openerp/http.py b/openerp/http.py
index 3bc2bc3..d32d003 100644 (file)
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -460,10 +460,8 @@ class HttpRequest(WebRequest):
            be used as response."""
         try:
             return super(HttpRequest, self)._handle_exception(exception)
-        except Exception, e:
-            if isinstance(e, werkzeug.exceptions.HTTPException):
-                return e
-            raise
+        except werkzeug.exceptions.HTTPException, e:
+            return e
 
     def dispatch(self):
         # TODO: refactor this correctly. This is a quick fix for pos demo.