Only decode unicode from http headers

HTTP client, not HTML
#115

diff --git a/requests/utils.py b/requests/utils.py
index d96310b4b98348ebe665e4925cd839ed6aa5c022..8a419acbc22b60eb24a6afbc4d31178663736a48 100644 (file)
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -132,23 +132,10 @@ def get_unicode_from_response(r):
 
     if encoding:
         try:
-            print '!'
             return unicode(r.content, encoding)
         except UnicodeError:
             tried_encodings.append(encoding)
 
-    # Try every encodings from <meta ... charset=XXX>
-    encodings = get_encodings_from_content(r.content)
-
-    for encoding in encodings:
-        if encoding in tried_encodings:
-            continue
-        try:
-
-            return unicode(r.content, encoding)
-        except (UnicodeError, TypeError):
-            tried_encodings.append(encoding)
-
     # Fall back:
     try:
         return unicode(r.content, encoding, errors='replace')