Merge pull request #38 from jgorset/requests
authorKenneth Reitz <me@kennethreitz.com>
Sun, 22 May 2011 21:54:10 +0000 (17:54 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 22 May 2011 21:54:10 +0000 (17:54 -0400)
---

Ive refactored `api.request`. I think. The new version is more robust in that it no longer accepts arbitrary arguments and raises an exception if one attempts to call it with both `params` and `data` (that should probably be supported, though, but thats a topic for another issue).

Conflicts:
requests/api.py


Trivial merge