projects / services / python-requests.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0b29964 7d0374d)
Merge pull request #35 from jgorset/requests
authorKenneth Reitz <me@kennethreitz.com>
Sat, 21 May 2011 17:04:32 +0000 (13:04 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 21 May 2011 17:04:32 +0000 (13:04 -0400)
commit8d9bcefa9de15ed62e58ff332dc8c403d5a264ff
treef2bb509a8a102cf70d4ae226c28844715b28cd37tree | snapshot
parent0b29964bf8fd51cc0287a58fff4ce548da393682commit | diff
parent7d0374df2f478b0a93af2d8ca317f38b556ba486commit | diff
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
requests/api.py diff1 | diff2 | blob | history
Domain: SCM / CI Services;