From 7881aaa759ce05fa944a1530db8ba889ffaf68e4 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 25 Sep 2011 21:04:13 -0400 Subject: [PATCH] =?utf8?q?clarity=E2=84=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- requests/sessions.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/requests/sessions.py b/requests/sessions.py index 7e5fa61..b6c4db7 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -19,22 +19,17 @@ from .utils import add_dict_to_cookiejar def merge_kwargs(local_kwarg, default_kwarg): """Merges kwarg dictionaries. - If a key in the dictionary is set to None, i + If a local key in the dictionary is set to None, it will be removed. """ # Bypass if not a dictionary (e.g. timeout) if not hasattr(local_kwarg, 'items'): return local_kwarg + # Update new values. kwargs = default_kwarg.copy() kwargs.update(local_kwarg) - # from clint.textui import colored - - - # print colored.red(default_kwarg) - # print colored.red(local_kwarg) - # Remove keys that are set to None. for (k,v) in local_kwarg.items(): if v is None: @@ -130,7 +125,7 @@ class Session(object): _kwargs[attr] = new_attr # Make sure we didn't miss anything. - for (k, v) in kwargs: + for (k, v) in kwargs.items(): if k not in _kwargs: _kwargs[k] = v -- 2.34.1