diff options
| author | Tom Christie | 2012-10-18 04:46:01 -0700 |
|---|---|---|
| committer | Tom Christie | 2012-10-18 04:46:01 -0700 |
| commit | 0c65d9babee24f7c772dde2fc98ea4fdcb2ab6aa (patch) | |
| tree | ffb4daf6f46779711b0d6e9619f85a96b80a51a9 /rest_framework/request.py | |
| parent | e8f542aac88677cd95c473d56511cadbc0c67813 (diff) | |
| parent | fed235dd0135c3eb98bb218a51f01ace5ddd3782 (diff) | |
| download | django-rest-framework-0c65d9babee24f7c772dde2fc98ea4fdcb2ab6aa.tar.bz2 | |
Merge pull request #304 from tomchristie/consitent_settings
Make settings consistent with corrosponding view attributes
Diffstat (limited to 'rest_framework/request.py')
| -rw-r--r-- | rest_framework/request.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/request.py b/rest_framework/request.py index b212680f..5870be82 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -92,7 +92,7 @@ class Request(object): self.parser_context['request'] = self def _default_negotiator(self): - return api_settings.DEFAULT_CONTENT_NEGOTIATION() + return api_settings.DEFAULT_CONTENT_NEGOTIATION_CLASS() @property def method(self): |