summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2016-06-14 00:41:58 -0700
committerTim Graham <timograham@gmail.com>2016-06-17 15:55:55 -0400
commit69de988f9237fe978c5fca363ca2d2622f8e2ccd (patch)
tree85e2b35e3173b62f395d78a018a454d999097606 /django/utils
parent34fbec3cb48f41dda8daecf2e8330233621fa059 (diff)
[1.10.x] Refs #26601 -- Improved backwards-compatibility of DEP 5 middleware exception handling.
Backport of 7d1b69dbe7f72ac04d2513f0468fe2146231b286 from master
Diffstat (limited to 'django/utils')
-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 7627426080..351bd1d27d 100644
--- a/django/utils/deprecation.py
+++ b/django/utils/deprecation.py
@@ -121,13 +121,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