Merge pull request #5496 from dbaxa/optimise-prepare-body

Avoid an unnecessary computation of the length of data for non-stream requests (which determine content-length based upon body content).
psf · Jun 17, 2020 · 7c71982 · 7c71982
2 parents 737dd0c + 71a05cf
commit 7c71982
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/requests/models.py b/requests/models.py
@@ -473,12 +473,12 @@ def prepare_body(self, data, files, json=None):
             not isinstance(data, (basestring, list, tuple, Mapping))
         ])
 
-        try:
-            length = super_len(data)
-        except (TypeError, AttributeError, UnsupportedOperation):
-            length = None
-
         if is_stream:
+            try:
+                length = super_len(data)
+            except (TypeError, AttributeError, UnsupportedOperation):
+                length = None
+
             body = data
 
             if getattr(body, 'tell', None) is not None: