diff options
| author | Tom Christie | 2013-02-01 15:07:51 +0000 | 
|---|---|---|
| committer | Tom Christie | 2013-02-01 15:07:51 +0000 | 
| commit | 00752dcd2a3647f2de2a259934753745597e3ade (patch) | |
| tree | bf730061dc16480f9a09da5b4916bf0d31f4fe6a /rest_framework/request.py | |
| parent | f4f237e3ee02fef4fd5f389bf4fb3bbdd00173bd (diff) | |
| download | django-rest-framework-00752dcd2a3647f2de2a259934753745597e3ade.tar.bz2 | |
Py3k cleanup
Diffstat (limited to 'rest_framework/request.py')
| -rw-r--r-- | rest_framework/request.py | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/rest_framework/request.py b/rest_framework/request.py index 23e1da87..597892ef 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -9,10 +9,11 @@ The wrapped request then offers a richer API, in particular :      - full support of PUT method, including support for file uploads      - form overloading of HTTP method, content type and content  """ -from rest_framework.compat import BytesIO  from django.http.multipartparser import parse_header +from rest_framework import HTTP_HEADER_ENCODING  from rest_framework import exceptions +from rest_framework.compat import BytesIO  from rest_framework.settings import api_settings @@ -20,7 +21,7 @@ def is_form_media_type(media_type):      """      Return True if the media type is a valid form media type.      """ -    base_media_type, params = parse_header(media_type.encode('iso-8859-1')) +    base_media_type, params = parse_header(media_type.encode(HTTP_HEADER_ENCODING))      return (base_media_type == 'application/x-www-form-urlencoded' or              base_media_type == 'multipart/form-data') @@ -277,7 +278,7 @@ class Request(object):              self._CONTENT_PARAM in self._data and              self._CONTENTTYPE_PARAM in self._data):              self._content_type = self._data[self._CONTENTTYPE_PARAM] -            self._stream = BytesIO(self._data[self._CONTENT_PARAM].encode('iso-8859-1')) +            self._stream = BytesIO(self._data[self._CONTENT_PARAM].encode(HTTP_HEADER_ENCODING))              self._data, self._files = (Empty, Empty)      def _parse(self): | 
