From: Kenneth Reitz <me@kennethreitz.com>
Date: Sun, 22 Jan 2012 03:56:53 +0000 (-0500)
Subject: don't double decode
X-Git-Tag: v0.10.0~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c7e920298d8bbd0f3b28972a5febf148fd33188;p=services%2Fpython-requests.git

don't double decode
---

diff --git a/requests/models.py b/requests/models.py
index f001c08..8a293cb 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -752,7 +752,8 @@ class Response(object):
 
         # Try to fall back:
         try:
-            content = unicode(content, encoding, errors='replace')
+            if not content:
+                content = unicode(content, encoding, errors='replace')
         except UnicodeError, TypeError:
             pass