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