From 3faff0b8ea2c3c7d87272971893234e26a01d9fc Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Tue, 27 May 2014 20:29:44 -0500 Subject: [PATCH 1/2] Check for basestring, not just str Fixes #2071 --- requests/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/models.py b/requests/models.py index 5475c14c..0d7132a4 100644 --- a/requests/models.py +++ b/requests/models.py @@ -433,7 +433,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin): else: if data: body = self._encode_params(data) - if isinstance(data, str) or isinstance(data, builtin_str) or hasattr(data, 'read'): + if isinstance(data, basestring) or isinstance(data, builtin_str) or hasattr(data, 'read'): content_type = None else: content_type = 'application/x-www-form-urlencoded' From 5ab79e2514b663ac8e0a82981efe0a5e69efe01c Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Wed, 28 May 2014 08:17:18 -0500 Subject: [PATCH 2/2] Remove unnecessary check for builtin_str --- requests/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/models.py b/requests/models.py index 0d7132a4..9b16b9d8 100644 --- a/requests/models.py +++ b/requests/models.py @@ -433,7 +433,7 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin): else: if data: body = self._encode_params(data) - if isinstance(data, basestring) or isinstance(data, builtin_str) or hasattr(data, 'read'): + if isinstance(data, basestring) or hasattr(data, 'read'): content_type = None else: content_type = 'application/x-www-form-urlencoded'