summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2011-01-15 06:06:09 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2011-01-15 06:06:09 +0000
commitf7d04c37b91063a0c2091a366de0891c05569f9e (patch)
tree34d30bad50a284fc90ac0542150b4208a247352f
parent74a61e35b82c8823ec73da5eb23c97e6e1724f06 (diff)
[1.2.X] Corrected r15205 syntax to be Python2.4 compatible.
Backport of r15210 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/handlers/wsgi.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py
index ace3ed31ca..b22d30a565 100644
--- a/django/core/handlers/wsgi.py
+++ b/django/core/handlers/wsgi.py
@@ -226,13 +226,14 @@ class WSGIHandler(base.BaseHandler):
if self._request_middleware is None:
self.initLock.acquire()
try:
- # Check that middleware is still uninitialised.
- if self._request_middleware is None:
- self.load_middleware()
- except:
- # Unload whatever middleware we got
- self._request_middleware = None
- raise
+ try:
+ # Check that middleware is still uninitialised.
+ if self._request_middleware is None:
+ self.load_middleware()
+ except:
+ # Unload whatever middleware we got
+ self._request_middleware = None
+ raise
finally:
self.initLock.release()