Skip to content

⚡️ Speed up function merge_setting by 61% #29

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 7 additions & 9 deletions src/requests/sessions.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,13 @@ def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
isinstance(session_setting, Mapping) and isinstance(request_setting, Mapping)
):
return request_setting

merged_setting = dict_class(to_key_val_list(session_setting))
merged_setting.update(to_key_val_list(request_setting))

# 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]

merged_setting = dict_class(session_setting)
for key, value in request_setting.items():
if value is None:
merged_setting.pop(key, None)
else:
merged_setting[key] = value

return merged_setting

Expand Down
2 changes: 1 addition & 1 deletion src/requests/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ def to_key_val_list(value):
raise ValueError("cannot encode objects that are not 2-tuples")

if isinstance(value, Mapping):
value = value.items()
return list(value.items())

return list(value)

Expand Down