Merge pull request #2268 from sigmavirus24/fix-params

Re-order params for backwards compat

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

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.