Skip to content

⚡️ Speed up function merge_hooks by 939% #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

⚡️ Speed up function merge_hooks by 939% #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/requests/sessions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
):
return request_setting

merged_setting = dict_class(to_key_val_list(session_setting))
merged_setting.update(to_key_val_list(request_setting))
merged_setting = dict_class()
for k, v in to_key_val_list(session_setting):
if v is not None:
merged_setting[k] = v

# Remove keys that are set to None. Extract keys first to avoid altering
# the dictionary during iteration.
none_keys = [k for (k, v) in merged_setting.items() if v is None]
for key in none_keys:
del merged_setting[key]
for k, v in to_key_val_list(request_setting):
if v is not None:
merged_setting[k] = v

return merged_setting

Expand All @@ -94,10 +94,10 @@ def merge_hooks(request_hooks, session_hooks, dict_class=OrderedDict):
This is necessary because when request_hooks == {'response': []}, the
merge breaks Session hooks entirely.
"""
if session_hooks is None or session_hooks.get("response") == []:
if session_hooks is None or not session_hooks.get("response"):
return request_hooks

if request_hooks is None or request_hooks.get("response") == []:
if request_hooks is None or not request_hooks.get("response"):
return session_hooks

return merge_setting(request_hooks, session_hooks, dict_class)
Expand Down