From 1661bf654385c51c7a33e4fe9fd01c2873244df5 Mon Sep 17 00:00:00 2001 From: Honza Javorek Date: Thu, 23 Feb 2012 17:28:56 +0100 Subject: [PATCH 1/2] get_unicode_from_response returned str instead of unicode --- requests/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/utils.py b/requests/utils.py index 106c7d89..e8172dee 100644 --- a/requests/utils.py +++ b/requests/utils.py @@ -374,7 +374,7 @@ def get_unicode_from_response(r): # Fall back: try: - return str(r.content, encoding, errors='replace') + return unicode(r.content, encoding, errors='replace') except TypeError: return r.content From 09c0365255a639932f0d17233249f298de000d03 Mon Sep 17 00:00:00 2001 From: Honza Javorek Date: Thu, 23 Feb 2012 23:51:59 +0100 Subject: [PATCH 2/2] str is redefined in compat module, but was not imported --- requests/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requests/utils.py b/requests/utils.py index e8172dee..09bb77c2 100644 --- a/requests/utils.py +++ b/requests/utils.py @@ -19,7 +19,7 @@ from netrc import netrc, NetrcParseError from .compat import parse_http_list as _parse_list_header from .compat import quote, cookielib, SimpleCookie, is_py2, urlparse -from .compat import basestring, bytes +from .compat import basestring, bytes, str NETRC_FILES = ('.netrc', '_netrc') @@ -374,7 +374,7 @@ def get_unicode_from_response(r): # Fall back: try: - return unicode(r.content, encoding, errors='replace') + return str(r.content, encoding, errors='replace') except TypeError: return r.content