Merge remote-tracking branch 'upstream/master' into fix-1719

Conflicts:
	rest_framework/templates/rest_framework/base.html

1 files changed, 6 insertions, 4 deletions

diff --git a/rest_framework/response.py b/rest_framework/response.py
index 5c02ea50..0a7d313f 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -8,7 +8,7 @@ from __future__ import unicode_literals
 import django
 from django.core.handlers.wsgi import STATUS_CODE_TEXT
 from django.template.response import SimpleTemplateResponse
-from rest_framework.compat import six
+from django.utils import six
 
 
 class Response(SimpleTemplateResponse):
@@ -20,7 +20,7 @@ class Response(SimpleTemplateResponse):
     if django.VERSION >= (1, 4):
         rendering_attrs = SimpleTemplateResponse.rendering_attrs + ['_closable_objects']
 
-    def __init__(self, data=None, status=200,
+    def __init__(self, data=None, status=None,
                  template_name=None, headers=None,
                  exception=False, content_type=None):
         """
@@ -62,8 +62,10 @@ class Response(SimpleTemplateResponse):
 
         ret = renderer.render(self.data, media_type, context)
         if isinstance(ret, six.text_type):
-            assert charset, 'renderer returned unicode, and did not specify ' \
-            'a charset value.'
+            assert charset, (
+                'renderer returned unicode, and did not specify '
+                'a charset value.'
+            )
             return bytes(ret.encode(charset))
 
         if not ret: