diff options
| -rw-r--r-- | rest_framework/parsers.py | 19 | ||||
| -rw-r--r-- | rest_framework/settings.py | 1 |
2 files changed, 4 insertions, 16 deletions
diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index a500060f..5151b252 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -34,8 +34,8 @@ class DataAndFiles(object): class BaseParser(object): """ - All parsers should extend :class:`BaseParser`, specifying a :attr:`media_type` attribute, - and overriding the :meth:`parse` method. + All parsers should extend `BaseParser`, specifying a `media_type` + attribute, and overriding the `.parse_stream()` method. """ media_type = None @@ -66,7 +66,7 @@ class BaseParser(object): def parse_stream(self, stream, **opts): """ - Given a *stream* to read from, return the deserialized output. + Given a stream to read from, return the deserialized output. Should return parsed data, or a DataAndFiles object consisting of the parsed data and files. """ @@ -234,16 +234,3 @@ class XMLParser(BaseParser): pass return value - - -DEFAULT_PARSERS = ( - JSONParser, - FormParser, - MultiPartParser, - XMLParser -) - -if yaml: - DEFAULT_PARSERS += (YAMLParser, ) -else: - YAMLParser = None diff --git a/rest_framework/settings.py b/rest_framework/settings.py index a0b99010..312d707d 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -29,6 +29,7 @@ DEFAULTS = { 'DEFAULT_PARSERS': ( 'rest_framework.parsers.JSONParser', 'rest_framework.parsers.FormParser' + 'rest_framework.parsers.MultiPartParser' ), 'DEFAULT_AUTHENTICATION': ( 'rest_framework.authentication.SessionAuthentication', |