From: Kenneth Reitz <me@kennethreitz.com>
Date: Sun, 22 May 2011 17:30:55 +0000 (-0400)
Subject: new config module
X-Git-Tag: v0.6.0~175
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=982fd9d8032385b1ee4ed97737d100077ab799c8;p=services%2Fpython-requests.git

new config module
---

diff --git a/requests/api.py b/requests/api.py
index 40e36d4..234f17a 100644
--- a/requests/api.py
+++ b/requests/api.py
@@ -12,7 +12,7 @@ This module impliments the Requests API.
 """
 
 import requests
-import settings
+import config
 from .models import Request, Response, AuthManager, AuthObject, auth_manager
 
 
@@ -40,7 +40,7 @@ def request(method, url, **kwargs):
         cookiejar=kwargs.pop('cookies', None),
         files=kwargs.pop('files', None),
         auth=kwargs.pop('auth', auth_manager.get_auth(url)),
-        timeout=kwargs.pop('timeout', settings.timeout),
+        timeout=kwargs.pop('timeout', config.settings.timeout),
         allow_redirects=kwargs.pop('allow_redirects', None)
     )