Merge branch 'develop' of https://github.com/honzajavorek/requests into develop

This commit is contained in:
Kenneth Reitz
2012-02-25 23:14:49 -05:00
+1 -1
View File
@@ -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')