From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 26 Sep 2011 01:04:13 +0000 (-0400)
Subject: clarity™
X-Git-Tag: v0.8.0~94^2~57
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7881aaa759ce05fa944a1530db8ba889ffaf68e4;p=services%2Fpython-requests.git

clarity™
---

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