Merge branch 'develop' of https://github.com/kigeia/requests into develop

This commit is contained in:
Kenneth Reitz
2011-08-30 23:57:24 -04:00
+2
View File
@@ -150,6 +150,8 @@ def get_encoding_from_headers(headers):
"""
content_type = headers.get('content-type')
if not content_type :
return
content_type, params = cgi.parse_header(content_type)
if 'charset' in params: