From 29ef1081583115c8bb2c8a592b883dc7c835240c Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Fri, 31 Oct 2014 21:20:04 -0500 Subject: [PATCH] Use to_native_string instead of builtin_str Fixes #2316 --- requests/sessions.py | 4 ++-- test_requests.py | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/requests/sessions.py b/requests/sessions.py index d701ff2e..dfce7cf9 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -13,7 +13,7 @@ from collections import Mapping from datetime import datetime from .auth import _basic_auth_str -from .compat import cookielib, OrderedDict, urljoin, urlparse, builtin_str +from .compat import cookielib, OrderedDict, urljoin, urlparse from .cookies import ( cookiejar_from_dict, extract_cookies_to_jar, RequestsCookieJar, merge_cookies) from .models import Request, PreparedRequest, DEFAULT_REDIRECT_LIMIT @@ -425,7 +425,7 @@ class Session(SessionRedirectMixin): If Tuple, ('cert', 'key') pair. """ - method = builtin_str(method) + method = to_native_string(method) # Create the Request. req = Request( diff --git a/test_requests.py b/test_requests.py index 467c5bc6..b2e12d06 100755 --- a/test_requests.py +++ b/test_requests.py @@ -1389,6 +1389,11 @@ class TestTimeout: except ConnectTimeout: pass + def test_encoded_methods(self): + """See: https://github.com/kennethreitz/requests/issues/2316""" + r = requests.request(b'GET', httpbin('get')) + assert r.ok + SendCall = collections.namedtuple('SendCall', ('args', 'kwargs'))