From: Kenneth Reitz <me@kennethreitz.com>
Date: Sat, 21 May 2011 17:04:32 +0000 (-0400)
Subject: Merge pull request #35 from jgorset/requests
X-Git-Tag: v0.4.1^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d9bcefa9de15ed62e58ff332dc8c403d5a264ff;p=services%2Fpython-requests.git

Merge pull request #35 from jgorset/requests

---

Ive completed the migration of the requests settings to the new `settings` module, but my attempt to facilitate for manipulating settings outside of the context manager (eg. `requests.settings.timeout = 5`) has been thwarted by the namespace collision of the context manager and the module.

Im probably just being stupid. Youll figure it out.

Conflicts:
	requests/api.py
---

8d9bcefa9de15ed62e58ff332dc8c403d5a264ff
diff --cc requests/api.py
index 61da42c,987374f..c98ff3a
--- a/requests/api.py
+++ b/requests/api.py
@@@ -11,7 -11,7 +11,8 @@@ This module impliments the Requests API
  
  """
  
 +import requests
+ import settings
  from .models import Request, Response, AuthManager, AuthObject, auth_manager