From: Jérémy Bethmont <jeremy.bethmont@gmail.com>
Date: Thu, 22 Sep 2011 09:13:51 +0000 (+0200)
Subject: Ignore unknown encoding.
X-Git-Tag: v0.8.0~94^2~26^2~5^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95b0549c75c61fe0b759400713112de357ae74b1;p=services%2Fpython-requests.git

Ignore unknown encoding.
---

diff --git a/requests/utils.py b/requests/utils.py
index 17f79a8..22084d0 100644
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -181,12 +181,12 @@ def unicode_from_html(content):
 def stream_decode_response_unicode(iterator, r):
     """Stream decodes a iterator."""
     encoding = get_encoding_from_headers(r.headers)
-    if encoding is None:
+    try:
+        decoder = codecs.getincrementaldecoder(str(encoding))(errors='replace')
+    except LookupError:
         for item in iterator:
             yield item
         return
-
-    decoder = codecs.getincrementaldecoder(encoding)(errors='replace')
     for chunk in iterator:
         rv = decoder.decode(chunk)
         if rv:
@@ -221,6 +221,8 @@ def get_unicode_from_response(r):
             return unicode(r.content, encoding)
         except UnicodeError:
             tried_encodings.append(encoding)
+        except LookupError:
+            return r.content
 
     # Fall back:
     try: