summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Apolloner <florian@apolloner.eu>2012-09-09 13:00:10 +0200
committerFlorian Apolloner <florian@apolloner.eu>2012-09-09 13:00:10 +0200
commit9ca17f883d7a637581befe8092120242d0534673 (patch)
tree5b744c09e1da230cf2b05afdda6852befa9c9401
parent5e99a3d41b5d7b7d8d135283fd25262fdcb1b7fd (diff)
Replace nested try/finally try/except with try/except/finally.
-rw-r--r--django/core/handlers/wsgi.py23
1 files changed, 11 insertions, 12 deletions
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py
index e445d07a61..7a32a3dac7 100644
--- a/django/core/handlers/wsgi.py
+++ b/django/core/handlers/wsgi.py
@@ -223,18 +223,17 @@ class WSGIHandler(base.BaseHandler):
set_script_prefix(base.get_script_name(environ))
signals.request_started.send(sender=self.__class__)
try:
- try:
- request = self.request_class(environ)
- except UnicodeDecodeError:
- logger.warning('Bad Request (UnicodeDecodeError)',
- exc_info=sys.exc_info(),
- extra={
- 'status_code': 400,
- }
- )
- response = http.HttpResponseBadRequest()
- else:
- response = self.get_response(request)
+ request = self.request_class(environ)
+ except UnicodeDecodeError:
+ logger.warning('Bad Request (UnicodeDecodeError)',
+ exc_info=sys.exc_info(),
+ extra={
+ 'status_code': 400,
+ }
+ )
+ response = http.HttpResponseBadRequest()
+ else:
+ response = self.get_response(request)
finally:
signals.request_finished.send(sender=self.__class__)