From 982fd9d8032385b1ee4ed97737d100077ab799c8 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 22 May 2011 13:30:55 -0400 Subject: [PATCH] new config module --- requests/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) ) -- 2.7.4