Re-order params for backwards compat

diff --git a/requests/models.py b/requests/models.py
index 245521dc27c9e6b2b272cef0f92f2b4b83fe951c..831ffb6e05491ca414ecf77789db0b251702d49e 100644 (file)
--- 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 a133e6a321da8dfe9e9dc4f0b4d4895b49b7668d..d701ff2ef8af82bf1a48a283ca2a68898a727a32 100644 (file)
--- 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.