From bbd58b922bb1e5268206aa266cddfb1293c6f959 Mon Sep 17 00:00:00 2001
From: Johannes <jgorset@gmail.com>
Date: Fri, 20 May 2011 20:32:39 +0200
Subject: [PATCH 1/3] Migrate settings to new module

---
 requests/__init__.py | 27 ---------------------------
 requests/api.py      |  5 +++--
 requests/core.py     |  2 +-
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/requests/__init__.py b/requests/__init__.py
index d1e75274..b87968f5 100644
--- a/requests/__init__.py
+++ b/requests/__init__.py
@@ -6,30 +6,3 @@ import packages
 from core import *
 
 from core import __version__
-
-timeout = None
-
-class settings:
-    
-    def __init__(self, **settings):
-        self._cache_settings(**settings)
-        self._alter_settings(**settings)
-        
-    def __enter__(self):
-        pass
-        
-    def __exit__(self, type, value, traceback):
-        self._restore_settings()
-        
-    def _cache_settings(self, **settings):
-        self.cache = {}
-        for setting in settings:
-            self.cache[setting] = globals()[setting]
-        
-    def _alter_settings(self, **settings):
-        for setting, value in settings.items():
-            globals()[setting] = value
-        
-    def _restore_settings(self):
-        for setting, value in self.cache.items():
-            globals()[setting] = value
\ No newline at end of file
diff --git a/requests/api.py b/requests/api.py
index 53577b4e..987374f9 100644
--- a/requests/api.py
+++ b/requests/api.py
@@ -11,7 +11,7 @@ This module impliments the Requests API.
 
 """
 
-import requests
+import settings
 from .models import Request, Response, AuthManager, AuthObject, auth_manager
 
 
@@ -37,7 +37,8 @@ def request(method, url, **kwargs):
     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', requests.timeout))
+                timeout=kwargs.pop('timeout', settings.timeout))
+    
     r.send()
 
     return r.response
diff --git a/requests/core.py b/requests/core.py
index fb239f2f..3d6fd641 100644
--- a/requests/core.py
+++ b/requests/core.py
@@ -22,4 +22,4 @@ __copyright__ = 'Copyright 2011 Kenneth Reitz'
 from models import HTTPError, auth_manager
 from api import *
 from exceptions import *
-from settings import *
\ No newline at end of file
+from settings import settings
\ No newline at end of file

From 2f60748c7340c0f1b034998677115d465d470f0d Mon Sep 17 00:00:00 2001
From: Johannes <jgorset@gmail.com>
Date: Fri, 20 May 2011 20:45:51 +0200
Subject: [PATCH 2/3] Stop importing inspect

---
 requests/__init__.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/requests/__init__.py b/requests/__init__.py
index b87968f5..d44b2667 100644
--- a/requests/__init__.py
+++ b/requests/__init__.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import inspect
-
 import packages
 from core import *
 

From 7d0374df2f478b0a93af2d8ca317f38b556ba486 Mon Sep 17 00:00:00 2001
From: Johannes <jgorset@gmail.com>
Date: Fri, 20 May 2011 22:50:50 +0200
Subject: [PATCH 3/3] Slight refactor

---
 requests/core.py     | 2 +-
 requests/settings.py | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/requests/core.py b/requests/core.py
index 3d6fd641..073d231b 100644
--- a/requests/core.py
+++ b/requests/core.py
@@ -22,4 +22,4 @@ __copyright__ = 'Copyright 2011 Kenneth Reitz'
 from models import HTTPError, auth_manager
 from api import *
 from exceptions import *
-from settings import settings
\ No newline at end of file
+from settings import Settings as settings
\ No newline at end of file
diff --git a/requests/settings.py b/requests/settings.py
index 00e27d62..1dc90079 100644
--- a/requests/settings.py
+++ b/requests/settings.py
@@ -8,6 +8,9 @@ This module provides the Requests settings feature set.
 
 """
 
+# Time (in seconds) to allow the request to connect to
+# the remote host before timing it out.
+timeout = None
 
 class Settings(object):
 
@@ -33,7 +36,3 @@ class Settings(object):
     def _restore_settings(self):
         for setting, value in self.cache.items():
             globals()[setting] = value
-
-
-settings = Settings
-timeout = None
\ No newline at end of file