summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2019-06-10 23:07:39 -0500
committerGitHub <noreply@github.com>2019-06-10 23:07:39 -0500
commiteef67d22e2648145674dfc329fe165d56d4e31c7 (patch)
treee3fc89b3c5038e69b668f7bcb14cc4f4be280995 /src
parent0a3f842daadde4ea0f0c5bc007d9a81adb8e5a18 (diff)
parentf9813e050988e69b3b972bcc4495671bde2dafa7 (diff)
downloadpyramid-eef67d22e2648145674dfc329fe165d56d4e31c7.tar.gz
pyramid-eef67d22e2648145674dfc329fe165d56d4e31c7.tar.bz2
pyramid-eef67d22e2648145674dfc329fe165d56d4e31c7.zip
Merge pull request #3496 from mmerickel/no-reinvoke-excview
do not reinvoke exception views if an exception hits the execution policy
Diffstat (limited to 'src')
-rw-r--r--src/pyramid/router.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/pyramid/router.py b/src/pyramid/router.py
index 19641aecd..fa1a9ebf7 100644
--- a/src/pyramid/router.py
+++ b/src/pyramid/router.py
@@ -273,7 +273,4 @@ class Router(object):
def default_execution_policy(environ, router):
with router.request_context(environ) as request:
- try:
- return router.invoke_request(request)
- except Exception:
- return request.invoke_exception_view(reraise=True)
+ return router.invoke_request(request)