Merge pull request #5673 from jjmaldonis/master

sigmavirus24 · web-flow · commit 589c4547338b · 2020-11-29T12:19:15.000-06:00
updated `get_encoding_from_headers` to return utf-8 if the content type is set to application/json
diff --git a/requests/utils.py b/requests/utils.py
@@ -503,6 +503,10 @@ def get_encoding_from_headers(headers):
     if 'text' in content_type:
         return 'ISO-8859-1'
 
+    if 'application/json' in content_type:
+        # Assume UTF-8 based on RFC 4627: https://www.ietf.org/rfc/rfc4627.txt since the charset was unset
+        return 'utf-8'
+
 
 def stream_decode_response_unicode(iterator, r):
     """Stream decodes a iterator."""
