From: Honza Javorek <honza@javorek.net>
Date: Thu, 23 Feb 2012 22:51:59 +0000 (+0100)
Subject: str is redefined in compat module, but was not imported
X-Git-Tag: v0.10.6~4^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09c0365255a639932f0d17233249f298de000d03;p=services%2Fpython-requests.git

str is redefined in compat module, but was not imported
---

diff --git a/requests/utils.py b/requests/utils.py
index e8172de..09bb77c 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