kennethreitz/requests
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1092 from jianlius/case-insensitive-update

Browse Source 
Make merge_kwargs case-insensitive when looking up keys.
This commit is contained in:
Kenneth Reitz
2013-01-09 23:07:45 -08:00
parent 6ec1a9ca52 a392a87389
commit 91f6e69cc4
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/sessions.py
+13 -2
View File
@@ -49,9 +49,20 @@ def merge_kwargs(local_kwarg, default_kwarg):
default_kwarg = from_key_val_list(default_kwarg)
local_kwarg = from_key_val_list(local_kwarg)
# Update new values.
# Update new values in a case-insensitive way
def get_original_key(original_keys, new_key):
"""
Finds the key from original_keys that case-insensitive matches new_key.
"""
for original_key in original_keys:
if key.lower() == original_key.lower():
return original_key
return new_key
kwargs = default_kwarg.copy()
kwargs.update(local_kwarg)
original_keys = kwargs.keys()
for key, value in local_kwarg.items():
kwargs[get_original_key(original_keys, key)] = value
# Remove keys that are set to None.
for (k, v) in local_kwarg.items():