From ae7f9afaf6592fa477792647bd8cee0a8560b4eb Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sat, 7 Sep 2013 10:25:16 -0500
Subject: [PATCH] Minor cleanup in the WSGI handler.

---
 django/core/handlers/wsgi.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py
index 81891c944a..c3d359caf7 100644
--- a/django/core/handlers/wsgi.py
+++ b/django/core/handlers/wsgi.py
@@ -93,7 +93,7 @@ class WSGIRequest(http.HttpRequest):
         self.META['PATH_INFO'] = path_info
         self.META['SCRIPT_NAME'] = script_name
         self.method = environ['REQUEST_METHOD'].upper()
-        _, content_params = self._parse_content_type(self.META.get('CONTENT_TYPE', ''))
+        _, content_params = self._parse_content_type(environ.get('CONTENT_TYPE', ''))
         if 'charset' in content_params:
             try:
                 codecs.lookup(content_params['charset'])
@@ -103,7 +103,7 @@ class WSGIRequest(http.HttpRequest):
                 self.encoding = content_params['charset']
         self._post_parse_error = False
         try:
-            content_length = int(self.environ.get('CONTENT_LENGTH'))
+            content_length = int(environ.get('CONTENT_LENGTH'))
         except (ValueError, TypeError):
             content_length = 0
         self._stream = LimitedStream(self.environ['wsgi.input'], content_length)
@@ -111,7 +111,7 @@ class WSGIRequest(http.HttpRequest):
         self.resolver_match = None
 
     def _is_secure(self):
-        return 'wsgi.url_scheme' in self.environ and self.environ['wsgi.url_scheme'] == 'https'
+        return self.environ.get('wsgi.url_scheme') == 'https'
 
     def _parse_content_type(self, ctype):
         """