Merge branch 'master' into resources-routers

1 files changed, 4 insertions, 2 deletions

diff --git a/rest_framework/response.py b/rest_framework/response.py
index be78c43a..5e1bf46e 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -1,5 +1,7 @@
+from __future__ import unicode_literals
 from django.core.handlers.wsgi import STATUS_CODE_TEXT
 from django.template.response import SimpleTemplateResponse
+from rest_framework.compat import six
 
 
 class Response(SimpleTemplateResponse):
@@ -22,9 +24,9 @@ class Response(SimpleTemplateResponse):
         self.data = data
         self.template_name = template_name
         self.exception = exception
-        
+
         if headers:
-            for name,value in headers.iteritems():
+            for name, value in six.iteritems(headers):
                 self[name] = value
 
     @property