From: Rick Mak Date: Thu, 18 Aug 2011 06:42:35 +0000 (+0800) Subject: Fix tried_encodings scope X-Git-Tag: v0.8.0~94^2~152^2~3^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d26f3333e4d2ac65fd82bd413bc5759a0808e259;p=services%2Fpython-requests.git Fix tried_encodings scope --- diff --git a/requests/models.py b/requests/models.py index a2e4c2e..a8aa6cb 100644 --- a/requests/models.py +++ b/requests/models.py @@ -430,23 +430,24 @@ class Response(object): 2. every encodings from 3. fall back and replace all unicode characters """ + tried_encodings = [] # Try charset from content-type encoding = self.get_encoding_from_content_type() if encoding: try: return unicode(content, encoding) except UnicodeError: - self.tried_encodings.append(encoding) + tried_encodings.append(encoding) # Try every encodings from encodings = self.get_encodings_from_content(content) for encoding in encodings: - if encoding in self.tried_encodings: + if encoding in tried_encodings: continue try: return unicode(content, encoding) except UnicodeError: - self.tried_encodings.append(encoding) + tried_encodings.append(encoding) # Fall back: return unicode(content, encoding, errors="replace")