Skip to content

Commit 2b3436e

Browse files
authored
Merge pull request #5492 from dbaxa/avoid-calling-resolve_redirects-whe-not-following-redirects
Remove what appears to be an un-needed call to self.resolve_redirects when not following redirects as part of creating a request's history.
2 parents 9ed5db8 + fa2dbe9 commit 2b3436e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

requests/sessions.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -658,11 +658,13 @@ def send(self, request, **kwargs):
658658

659659
extract_cookies_to_jar(self.cookies, request, r.raw)
660660

661-
# Redirect resolving generator.
662-
gen = self.resolve_redirects(r, request, **kwargs)
663-
664661
# Resolve redirects if allowed.
665-
history = [resp for resp in gen] if allow_redirects else []
662+
if allow_redirects:
663+
# Redirect resolving generator.
664+
gen = self.resolve_redirects(r, request, **kwargs)
665+
history = [resp for resp in gen]
666+
else:
667+
history = []
666668

667669
# Shuffle things around if there's history.
668670
if history:

0 commit comments

Comments
 (0)