From: Kenneth Reitz <me@kennethreitz.com>
Date: Wed, 24 Aug 2011 03:03:18 +0000 (-0400)
Subject: Only decode unicode from http headers
X-Git-Tag: v0.6.4^2~5^2~5^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a94541d38c8883457195a1a388c56172fc2df745;p=services%2Fpython-requests.git

Only decode unicode from http headers
HTTP client, not HTML
#115
---

diff --git a/requests/utils.py b/requests/utils.py
index d96310b..8a419ac 100644
--- 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')