Commit Graph

4235 Commits

Author SHA1 Message Date
kennethreitz 4e880b5bbe Update 3.0-HISTORY.rst 2016-02-13 08:35:41 -05:00
kennethreitz a94b3e4513 update version and (c) 2016-02-03 03:57:41 -05:00
kennethreitz d9b1cac867 cleanup test_requests from merge 2016-02-03 03:56:08 -05:00
kennethreitz 14b6f6fad8 Merge branch 'master' into proposed/3.0.0
# Conflicts:
#	test_requests.py
2016-02-03 03:54:44 -05:00
kennethreitz 6e35ec4c12 cleandup test_requests.py 2016-02-03 03:50:14 -05:00
kennethreitz 90688c68ad cleanup setup.py from #2991 2016-02-03 03:37:52 -05:00
kennethreitz 458cb64e3d cleanup tests from merge of #2991 2016-02-03 03:35:51 -05:00
kennethreitz 5481db22b5 Merge pull request #2991 from Stranger6667/tests-refactoring
[WIP] Test suite refactoring
2016-02-03 03:26:27 -05:00
Dmitry Dygalo 6c2942b198 Initial work 2016-02-02 13:24:05 +01:00
kennethreitz 20ca527751 Merge branch 'master' into proposed/3.0.0 2016-02-02 02:35:16 -05:00
kennethreitz b782e66462 happy belated new year 2016-02-02 02:33:53 -05:00
kennethreitz c270845a46 Update 3.0-HISTORY.rst 2016-02-02 02:31:45 -05:00
kennethreitz d6538d7034 requests.get(..., session=Session()) 2016-02-02 02:23:55 -05:00
kennethreitz 0e51e48473 PreparedRequest.send() 2016-02-02 02:12:38 -05:00
kennethreitz 789227f5a9 notes on Session.resolve_redirects's response arg 2016-02-02 02:09:38 -05:00
kennethreitz be83be2457 lots of docstrings 2016-02-02 01:42:48 -05:00
kennethreitz 0d8f38a403 cleaned up Session.resolve_redirects() code 2016-02-02 00:56:53 -05:00
kennethreitz 66eedec782 Session.resolve_redirects code cleanup 2016-02-02 00:48:09 -05:00
kennethreitz 4dfe7a4885 Remove req argument from Session.resolve_redirects 2016-02-02 00:31:08 -05:00
kennethreitz 0f930d99f2 resolve merge errors causing test failures 2016-02-02 00:10:06 -05:00
kennethreitz a0b7bdd187 Merge commit '1881851' into v3.0.0 2016-02-01 23:57:29 -05:00
kennethreitz ad4d87437a Merge commit 'ea1cbb3' into v3.0.0 2016-02-01 23:49:08 -05:00
kennethreitz 2ce700f9a2 Merge commit 'aa8c8f3' into v3.0.0 2016-02-01 23:48:55 -05:00
kennethreitz d4eb2e9ce1 Merge commit '9c5ce48' into v3.0.0 2016-02-01 23:47:34 -05:00
kennethreitz 4b60bd4d7b Merge commit 'f351c1b' into v3.0.0 2016-02-01 23:47:26 -05:00
kennethreitz c44fb99633 Merge commit '91eebb1' into v3.0.0 2016-02-01 23:47:05 -05:00
kennethreitz 5da8a34277 Merge commit '42944007338bdaa570a3ab25aafc279ef150d169' into v3.0.0 2016-02-01 23:46:41 -05:00
kennethreitz 6dff2bb71c Merge commit '8c4d4f1af3a501ae0beec5e270f3206cda5c4842' into v3.0.0 2016-02-01 23:46:26 -05:00
kennethreitz 26cf9abfd6 Merge commit '4aa4f82b37aeb272637fafeff498014af1c11c6b' into v3.0.0 2016-02-01 23:39:17 -05:00
kennethreitz d1871fabe9 Merge commit 'ff8153d9c56bfa62782fb99743219d0b02b512bb' into v3.0.0 2016-02-01 23:28:55 -05:00
kennethreitz 45f110b52d Merge commit '636b946af5eac8ba4cffa63a727523cd8c2c01ab' into v3.0.0 2016-02-01 23:28:26 -05:00
Cory Benfield ed8cfd33e6 Merge pull request #2986 from untitaker/syntax-error
Fix syntax error
2016-01-30 19:14:20 +00:00
Markus Unterwaditzer 2140c98fa4 Fix syntax error 2016-01-30 19:59:58 +01:00
Cory Benfield 3f725bc226 Merge pull request #2985 from homeworkprod/patch-1
Fixed markup for/rendering of list in section "Custom Headers".
2016-01-30 14:00:14 +00:00
Jochen Kupperschmidt 0d25f8a00c Fixed markup for/rendering of list in section "Custom Headers". 2016-01-30 14:45:07 +01:00
kennethreitz 6195edc075 cleanup of auth __eq__ 2016-01-29 22:18:07 -05:00
kennethreitz f7447d1871 Merge pull request #2958 from Malizor/master
Add equality functions for authentication handlers
2016-01-29 22:08:26 -05:00
kennethreitz 3f8b1fb617 Merge pull request #2984 from rbcarson/httpadapter-maxretries-doc
Remove int type on HTTPAdapter's max_retries argument doc
2016-01-29 21:59:03 -05:00
Carson Lam a02069ec9e Remove int type on max_retries argument. 2016-01-29 15:30:22 -08:00
Ian Cordasco 645ac3087f Merge pull request #2981 from Lukasa/unencrypted-keys
Warn about encrypted keys in the docs.
2016-01-27 10:19:26 -06:00
Cory Benfield 5887b136e3 Warn about encrypted keys in the docs. 2016-01-27 11:56:27 +00:00
Cory Benfield 00fa5f171c Merge pull request #2976 from shoma/fix-debug-logging-doc
Fix api doc of debug logging for Python 3
2016-01-22 07:12:01 +00:00
shoma 75c7e5f1c3 Update example for Python 2/3 compatible. 2016-01-22 13:48:22 +09:00
shoma ceb88ac077 Fix api doc of debug logging for Python 3 2016-01-22 12:47:18 +09:00
Cory Benfield d76f304462 Merge pull request #2972 from munro/master
Return request & response with TooManyRedirects
2016-01-21 23:01:58 +00:00
Ryan Munro 56a1b55a42 Use httpbin to assert the final redirection URL 2016-01-20 11:24:03 -08:00
Ryan Munro 1f05867493 Add exception message to TooManyRedirects test 2016-01-20 11:06:39 -08:00
Ryan Munro 6a8a480d6c Review changes to TooManyRedirect exception with response 2016-01-20 10:48:12 -08:00
Cory Benfield 8b92d9989b Merge pull request #2973 from sigmavirus24/no-distutils-fallback
Stop falling back to distutils in setup.py
2016-01-20 13:54:58 +00:00
Ian Cordasco 5f2fef5bb5 Stop falling back to distutils in setup.py
distutils has been deprecated for years now and pip is refusing to install
projects using it. As such, *some* users are reporting problems installing
requests. Let's avoid this entirely by not falling back to distutils at all.
2016-01-20 07:51:42 -06:00