Merge pull request #316 from samrussell/handle_unicode_body

Fix bug in handling unicode body

Author: markstory

responses.py

@@ -345,11 +345,10 @@ def __init__(
                 content_type = "application/json"
 
         if content_type is UNSET:
-            content_type = "text/plain"
-
-        # body must be bytes
-        if isinstance(body, six.text_type):
-            body = body.encode("utf-8")
+            if isinstance(body, six.text_type) and _has_unicode(body):
+                content_type = "text/plain; charset=utf-8"
+            else:
+                content_type = "text/plain"
 
         self.body = body
         self.status = status

test_responses.py

@@ -924,6 +924,21 @@ def run():
     assert_reset()
 
 
+def test_handles_unicode_body():
+    url = "http://example.com/test"
+
+    @responses.activate
+    def run():
+        responses.add(responses.GET, url, body="михољско лето")
+
+        resp = requests.get(url)
+
+        assert_response(resp, "михољско лето", content_type="text/plain; charset=utf-8")
+
+    run()
+    assert_reset()
+
+
 def test_handles_buffered_reader_body():
     url = "http://example.com/test"