From bc290f62d7f17392ac30e57cc213c5034c48b9da Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Sun, 22 May 2011 13:55:13 -0400
Subject: [PATCH] defaults

---
 requests/api.py    | 12 ++++++------
 requests/config.py |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/requests/api.py b/requests/api.py
index 234f17a..0e27410 100644
--- a/requests/api.py
+++ b/requests/api.py
@@ -36,12 +36,12 @@ def request(method, url, **kwargs):
     """
     data = kwargs.pop('data', dict()) or kwargs.pop('params', dict())
 
-    r = Request(method=method, url=url, data=data, headers=kwargs.pop('headers', {}),
-        cookiejar=kwargs.pop('cookies', None),
-        files=kwargs.pop('files', None),
-        auth=kwargs.pop('auth', auth_manager.get_auth(url)),
-        timeout=kwargs.pop('timeout', config.settings.timeout),
-        allow_redirects=kwargs.pop('allow_redirects', None)
+    r = Request(method=method, url=url, data=data, headers=kwargs.pop('headers', dict()),
+        cookiejar=kwargs.get('cookies', None),
+        files=kwargs.get('files', None),
+        auth=kwargs.get('auth', auth_manager.get_auth(url)),
+        timeout=kwargs.get('timeout', config.settings.timeout),
+        allow_redirects=kwargs.get('allow_redirects', None)
     )
 
     r.send()
diff --git a/requests/config.py b/requests/config.py
index 6d6d190..351f918 100644
--- a/requests/config.py
+++ b/requests/config.py
@@ -26,6 +26,7 @@ class Settings(object):
 
         # cache previous settings for __exit__
         r.__cache = self.__dict__.copy()
+        map(self.__cache.setdefault, self.__attrs__)
 
         # set new settings
         self.__dict__.update(*args, **kwargs)
@@ -40,6 +41,7 @@ class Settings(object):
     def __exit__(self, *args):
 
         # restore cached copy
+        print '>>> {0}'.format(self.__cache)
         self.__dict__.update(self.__cache.copy())
         del self.__cache
 
-- 
2.7.4