From: Kenneth Reitz <me@kennethreitz.com>
Date: Sun, 22 May 2011 22:01:21 +0000 (-0400)
Subject: refactor^2
X-Git-Tag: v0.5.0^2~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3189d8690e5b6a90d1921e9697e9231269f806e4;p=services%2Fpython-requests.git

refactor^2
---

diff --git a/requests/api.py b/requests/api.py
index 164eb62..a81e487 100644
--- a/requests/api.py
+++ b/requests/api.py
@@ -19,7 +19,7 @@ from .models import Request, Response, AuthManager, AuthObject, auth_manager
 __all__ = ('request', 'get', 'head', 'post', 'put', 'delete')
 
 def request(method, url, params=None, data=None, headers=None, cookies=None, files=None, auth=None,
-            timeout=config.settings.timeout, allow_redirects=False):
+            timeout=None, allow_redirects=False):
     """Constructs and sends a :class:`Request <models.Request>`. Returns :class:`Response <models.Response>` object.
 
     :param method: method for the new :class:`Request` object.
@@ -45,7 +45,7 @@ def request(method, url, params=None, data=None, headers=None, cookies=None, fil
         cookiejar = cookies,
         files = files,
         auth = auth or auth_manager.get_auth(url),
-        timeout = timeout,
+        timeout = timeout or config.settings.timeout,
         allow_redirects = allow_redirects
     )