aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/response.py4
-rw-r--r--rest_framework/tests/htmlrenderer.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/response.py b/rest_framework/response.py
index 796750fc..9a633a8a 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -8,7 +8,7 @@ class Response(SimpleTemplateResponse):
arbitrary media types.
"""
- def __init__(self, data=None, status=None,
+ def __init__(self, data=None, status=200,
template_name=None, headers=None):
"""
Alters the init arguments slightly.
@@ -30,7 +30,7 @@ class Response(SimpleTemplateResponse):
assert renderer, "No accepted renderer set on Response"
assert media_type, "No accepted media type set on Response"
- self['content-type'] = media_type
+ self['Content-Type'] = media_type
if self.data is None:
return renderer.render()
diff --git a/rest_framework/tests/htmlrenderer.py b/rest_framework/tests/htmlrenderer.py
index 2c672dd0..7a7f2743 100644
--- a/rest_framework/tests/htmlrenderer.py
+++ b/rest_framework/tests/htmlrenderer.py
@@ -47,4 +47,4 @@ class HTMLRendererTests(TestCase):
def test_simple_html_view(self):
response = self.client.get('/')
self.assertContains(response, "example: foobar")
- self.assertEquals(response['content-type'], 'text/html')
+ self.assertEquals(response['Content-Type'], 'text/html')