summaryrefslogtreecommitdiff
path: root/django/utils/deprecation.py
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2016-06-14 00:41:58 -0700
committerCarl Meyer <carl@oddbird.net>2016-06-17 10:00:39 -0700
commit7d1b69dbe7f72ac04d2513f0468fe2146231b286 (patch)
tree31478358078d603fb54c02f22792d47707b9aed5 /django/utils/deprecation.py
parent104ee2fdae7fcd402396c709c91f5c84de6e4165 (diff)
Refs #26601 -- Improved backwards-compatibility of DEP 5 middleware exception handling.
Diffstat (limited to 'django/utils/deprecation.py')
-rw-r--r--django/utils/deprecation.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/django/utils/deprecation.py b/django/utils/deprecation.py
index 7872124cd6..5bff40f474 100644
--- a/django/utils/deprecation.py
+++ b/django/utils/deprecation.py
@@ -124,13 +124,7 @@ class MiddlewareMixin(object):
if hasattr(self, 'process_request'):
response = self.process_request(request)
if not response:
- try:
- response = self.get_response(request)
- except Exception as e:
- if hasattr(self, 'process_exception'):
- return self.process_exception(request, e)
- else:
- raise
+ response = self.get_response(request)
if hasattr(self, 'process_response'):
response = self.process_response(request, response)
return response