diff options
| author | Serhiy Voyt | 2014-06-27 18:10:50 +0300 |
|---|---|---|
| committer | Serhiy Voyt | 2014-06-27 18:10:50 +0300 |
| commit | 3326ddc865154b0c09fc3bb0da2644f0dfc3bc24 (patch) | |
| tree | 6df4c5adf05460fc2949e74efbc57dec80d789dc /rest_framework/test.py | |
| parent | 4e6a21344fd1fda28d1d63c5aa697fac5e9f8029 (diff) | |
| parent | 636ae419be2882dbec8151b6baa60bde118faede (diff) | |
| download | django-rest-framework-3326ddc865154b0c09fc3bb0da2644f0dfc3bc24.tar.bz2 | |
Merge branch 'master' into modelserialization-charfield-with-null
Diffstat (limited to 'rest_framework/test.py')
| -rw-r--r-- | rest_framework/test.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/test.py b/rest_framework/test.py index df5a5b3b..284bcee0 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -36,7 +36,7 @@ class APIRequestFactory(DjangoRequestFactory): """ if not data: - return ('', None) + return ('', content_type) assert format is None or content_type is None, ( 'You may not set both `format` and `content_type`.' |