diff options
| author | Kenneth Reitz <me@kennethreitz.org> | 2014-10-06 05:40:03 -0400 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.org> | 2014-10-06 05:40:03 -0400 |
| commit | 6da438dabd6f5aeed23f77fd663d4092506ec8b3 (patch) | |
| tree | 8f0e57ac3a608df79fec0c8d50a263c62fb529d4 | |
| parent | 4ec26da2f7ab6a0e5f66fcb945145657e3f9bed1 (diff) | |
| parent | 0e4efab270780726fbf4f8b6704f8f22741399d6 (diff) | |
| download | python-requests-6da438dabd6f5aeed23f77fd663d4092506ec8b3.tar.gz | |
Merge pull request #2268 from sigmavirus24/fix-params
Re-order params for backwards compat
| -rw-r--r-- | requests/models.py | 4 | ||||
| -rw-r--r-- | requests/sessions.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/requests/models.py b/requests/models.py index aaa50632..17e55988 100644 --- a/requests/models.py +++ b/requests/models.py @@ -213,11 +213,11 @@ class Request(RequestHooksMixin): headers=None, files=None, data=None, - json=None, params=None, auth=None, cookies=None, - hooks=None): + hooks=None, + json=None): # Default empty dicts for dict params. data = [] if data is None else data diff --git a/requests/sessions.py b/requests/sessions.py index a133e6a3..d701ff2e 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -378,7 +378,6 @@ class Session(SessionRedirectMixin): def request(self, method, url, params=None, data=None, - json=None, headers=None, cookies=None, files=None, @@ -389,7 +388,8 @@ class Session(SessionRedirectMixin): hooks=None, stream=None, verify=None, - cert=None): + cert=None, + json=None): """Constructs a :class:`Request <Request>`, prepares it and sends it. Returns :class:`Response <Response>` object. |