summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Tovt <uran198@gmail.com>2015-11-20 16:10:47 +0200
committerAttila Tovt <uran198@gmail.com>2015-11-20 16:12:17 +0200
commit8092745593e2aa7b54c6de44d12a893772ace3e9 (patch)
tree624129f81ea3acd324d6026fd01ccd7f8a4064ee
parentb54de853e0e33c1299cbd3539980742084481914 (diff)
Fixed #25779 -- Removed redundant try block in WSGIHandler
-rw-r--r--django/core/handlers/wsgi.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py
index 60e68a005c..5ade1c3500 100644
--- a/django/core/handlers/wsgi.py
+++ b/django/core/handlers/wsgi.py
@@ -155,14 +155,9 @@ class WSGIHandler(base.BaseHandler):
# settings weren't available.
if self._request_middleware is None:
with self.initLock:
- try:
- # Check that middleware is still uninitialized.
- if self._request_middleware is None:
- self.load_middleware()
- except Exception:
- # Unload whatever middleware we got
- self._request_middleware = None
- raise
+ # Check that middleware is still uninitialized.
+ if self._request_middleware is None:
+ self.load_middleware()
set_script_prefix(get_script_name(environ))
signals.request_started.send(sender=self.__class__, environ=environ)