kennethreitz/requests3
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests3.git synced 2026-06-05 23:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid altering dictionary size during iteration, by gathering keys that need to be deleted first.

Browse Source 
Fixes `RuntimeError` on Python 3 introduced in 53ea23128e
This commit is contained in:
Martijn Pieters
2015-08-21 08:44:09 +01:00
parent c7c26fb8eb
commit 4947cd01ae
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/sessions.py
+5 -4
View File
@@ -62,10 +62,11 @@ def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
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.
for (k, v) in merged_setting.items():
if v is None:
del merged_setting[k]
# 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]
return merged_setting