summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCurtis <curtis@tinbrain.net>2014-02-09 10:01:16 +1100
committerCurtis <curtis@tinbrain.net>2014-02-09 10:01:16 +1100
commitf43e895b15df4d5852b79049729d598baa86c186 (patch)
tree707374c7db1426e84b36fd9f7efbaa710daaf541
parent6fe26bd3ee75a6d804ca3861181ad61b1cca45ea (diff)
Replace _parse_content_type with cgi.parse_header
-rw-r--r--django/core/handlers/wsgi.py18
1 files changed, 2 insertions, 16 deletions
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py
index 46efd0477e..19e7e53176 100644
--- a/django/core/handlers/wsgi.py
+++ b/django/core/handlers/wsgi.py
@@ -1,5 +1,6 @@
from __future__ import unicode_literals
+import cgi
import codecs
import logging
import sys
@@ -95,7 +96,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(environ.get('CONTENT_TYPE', ''))
+ _, content_params = cgi.parse_header(environ.get('CONTENT_TYPE', ''))
if 'charset' in content_params:
try:
codecs.lookup(content_params['charset'])
@@ -115,21 +116,6 @@ class WSGIRequest(http.HttpRequest):
def _get_scheme(self):
return self.environ.get('wsgi.url_scheme')
- def _parse_content_type(self, ctype):
- """
- Media Types parsing according to RFC 2616, section 3.7.
-
- Returns the data type and parameters. For example:
- Input: "text/plain; charset=iso-8859-1"
- Output: ('text/plain', {'charset': 'iso-8859-1'})
- """
- content_type, _, params = ctype.partition(';')
- content_params = {}
- for parameter in params.split(';'):
- k, _, v = parameter.strip().partition('=')
- content_params[k] = v
- return content_type, content_params
-
def _get_request(self):
warnings.warn('`request.REQUEST` is deprecated, use `request.GET` or '
'`request.POST` instead.', PendingDeprecationWarning, 2)