Changes check on base and json. Fails on tests.

2026-06-05 23:10:16 +00:00 · 2014-08-28 19:27:45 -07:00
parent b34a496649
commit 402f3b4993
1 changed files with 5 additions and 6 deletions
@@ -442,13 +442,12 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
            if files:
                (body, content_type) = self._encode_files(files, data)
            else:
-                if data and not _json:
+                if data and _json is None:
                    body = self._encode_params(data)
-                    if not _json:
-                        if isinstance(data, basestring) or hasattr(data, 'read'):
-                            content_type = None
-                        else:
-                            content_type = 'application/x-www-form-urlencoded'
+                    if isinstance(data, basestring) or hasattr(data, 'read'):
+                        content_type = None
+                    else:
+                        content_type = 'application/x-www-form-urlencoded'

            self.prepare_content_length(body)