From a609f726e633018ebd0f11d59d7c63f54945b1be Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Sat, 20 Aug 2011 19:43:36 -0400
Subject: [PATCH] settings.allow_unicode

---
 requests/config.py | 1 +
 requests/models.py | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/requests/config.py b/requests/config.py
index 39be2ed4..5a7fcd3f 100644
--- a/requests/config.py
+++ b/requests/config.py
@@ -62,6 +62,7 @@ settings.proxies = None
 settings.verbose = None
 settings.timeout = None
 settings.max_redirects = 30
+settings.allow_unicode = True
 
 #: Use socket.setdefaulttimeout() as fallback?
 settings.timeout_fallback = True
diff --git a/requests/models.py b/requests/models.py
index 26436892..d3483149 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -453,12 +453,8 @@ class Response(object):
                     pass
 
             # Decode unicode content.
-            try:
+            if settings.allow_unicode:
                 self._content = get_unicode_from_response(self)
-            # Don't trust this stuff.
-            except UserWarning, e:
-                print e
-
 
             return self._content