summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorpscottdevos <scott.devos@sykes.com>2015-08-07 14:28:54 -0500
committerTim Graham <timograham@gmail.com>2015-08-11 10:01:24 -0400
commit7fa1dd8a80795d7573fe650014c5d23af7557bc7 (patch)
treef3278cad054f28203a614854c2787e1debe10955 /django
parent56ed80ac2a7dac6dc26754f7fe95941e8a6f124e (diff)
Fixed #25163 -- Fixed exception handling in nested test client requests.
Diffstat (limited to 'django')
-rw-r--r--django/test/client.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/test/client.py b/django/test/client.py
index 945fa13281..8d46ea629a 100644
--- a/django/test/client.py
+++ b/django/test/client.py
@@ -442,9 +442,9 @@ class Client(RequestFactory):
signal_uid = "template-render-%s" % id(request)
signals.template_rendered.connect(on_template_render, dispatch_uid=signal_uid)
# Capture exceptions created by the handler.
- got_request_exception.connect(self.store_exc_info, dispatch_uid="request-exception")
+ exception_uid = "request-exception-%s" % id(request)
+ got_request_exception.connect(self.store_exc_info, dispatch_uid=exception_uid)
try:
-
try:
response = self.handler(environ)
except TemplateDoesNotExist as e:
@@ -493,7 +493,7 @@ class Client(RequestFactory):
return response
finally:
signals.template_rendered.disconnect(dispatch_uid=signal_uid)
- got_request_exception.disconnect(dispatch_uid="request-exception")
+ got_request_exception.disconnect(dispatch_uid=exception_uid)
def get(self, path, data=None, follow=False, secure=False, **extra):
"""