Merge "Properly raise HTTP 405 (and specify Allow headers) for RestController"

1 files changed, 6 insertions, 3 deletions

diff --git a/pecan/routing.py b/pecan/routing.py
index 1d534aa..91c9fe3 100644
--- a/pecan/routing.py
+++ b/pecan/routing.py
@@ -49,7 +49,10 @@ def lookup_controller(obj, remainder, request=None):
                                          request)
             handle_security(obj)
             return obj, remainder
-        except (exc.HTTPNotFound, PecanNotFound):
+        except (exc.HTTPNotFound, exc.HTTPMethodNotAllowed,
+                PecanNotFound) as e:
+            if isinstance(e, PecanNotFound):
+                e = exc.HTTPNotFound()
             while notfound_handlers:
                 name, obj, remainder = notfound_handlers.pop()
                 if name == '_default':
@@ -67,11 +70,11 @@ def lookup_controller(obj, remainder, request=None):
                             remainder == [''] and
                             len(obj._pecan['argspec'].args) > 1
                         ):
-                            raise exc.HTTPNotFound
+                            raise e
                         obj_, remainder_ = result
                         return lookup_controller(obj_, remainder_, request)
             else:
-                raise exc.HTTPNotFound
+                raise e
 
 
 def handle_lookup_traversal(obj, args):