From: Kenneth Reitz <me@kennethreitz.com>
Date: Sat, 19 Nov 2011 21:12:38 +0000 (-0500)
Subject: iter_content uses new encoding system
X-Git-Tag: v0.8.2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6421ec1784642a3e34fb3af4e6a3e05fb2dbc899;p=services%2Fpython-requests.git

iter_content uses new encoding system
---

diff --git a/requests/utils.py b/requests/utils.py
index a24327e..f31cad8 100644
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -296,13 +296,13 @@ 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:
+
+    if r.encoding is None:
         for item in iterator:
             yield item
         return
 
-    decoder = codecs.getincrementaldecoder(encoding)(errors='replace')
+    decoder = codecs.getincrementaldecoder(r.encoding)(errors='replace')
     for chunk in iterator:
         rv = decoder.decode(chunk)
         if rv: