summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove remaining test that contacts external server.pytest-httpbinCory Benfield2015-11-051-1/+1
* Remove threaded testCory Benfield2015-11-051-15/+0
* Pin httpbin version.Cory Benfield2015-11-051-0/+1
* Fixup assertion broken in rewrite to py.testCory Benfield2015-11-051-1/+1
* Stop being so specific when testing error strings.Cory Benfield2015-11-051-1/+1
* Use py.test style assertionsCory Benfield2015-11-051-2/+2
* Inject and use httpbin fixture everywhere.Cory Benfield2015-11-051-90/+90
* Make sure we unapply this patch.Cory Benfield2015-11-051-21/+26
* Stop using HTTP and HTTPS schemes in one test.Cory Benfield2015-11-051-2/+1
* Stop inheriting from unittest.TestCaseCory Benfield2015-11-051-1/+1
* Define some httpbin fixtures.Cory Benfield2015-11-051-9/+22
* Add pytest-httpbin requirement.Cory Benfield2015-11-051-0/+1
* Update trove classifiers.Cory Benfield2015-11-051-2/+2
* Merge pull request #2849 from annp89/masterIan Cordasco2015-10-261-0/+1
|\
| * Add 511 Network Authentication Required status code to dict of status codesAnn Paul2015-10-261-0/+1
|/
* Merge pull request #2825 from Lukasa/universal_newlinesIan Cordasco2015-10-245-4/+66
|\
| * Emit warnings when using text mode files.Cory Benfield2015-10-243-3/+39
| * Add warnings about text/binary mode files.Cory Benfield2015-10-142-1/+27
* | Merge pull request #2845 from gagoman/fix-2844Cory Benfield2015-10-232-1/+6
|\ \
| * | fix issue #2844Alex Khomchenko2015-10-232-1/+6
|/ /
* | Merge pull request #2831 from shagunsodhani/proposed-fix-for-#2826Cory Benfield2015-10-162-2/+3
|\ \
| * | added fix for #2826shagun Sodhani2015-10-162-2/+3
|/ /
* | Merge pull request #2829 from dblia/getresponse-bufferingCory Benfield2015-10-151-1/+9
|\ \
| * | Use buffering for HTTP responses on chunked requestsDimitris Bliablias2015-10-151-1/+9
|/ /
* | Merge pull request #2827 from daniel-mueller/masterCory Benfield2015-10-151-2/+2
|\ \ | |/ |/|
| * Fixed usage example in sessions.pyDaniel Müller2015-10-151-2/+2
|/
* v2.8.1v2.8.1Cory Benfield2015-10-132-2/+16
* Merge pull request #2821 from Lukasa/issue/2818Cory Benfield2015-10-123-4/+12
|\
| * Move to_native_string for methods to prepare()Cory Benfield2015-10-122-4/+1
| * Failing test for issue #2818Cory Benfield2015-10-121-0/+11
|/
* Merge pull request #2810 from Lukasa/certupdateIan Cordasco2015-10-081-795/+1385
|\
| * Update requests certificate bundle.Cory Benfield2015-10-081-795/+1385
* | Merge pull request #2814 from Lukasa/issue/2813Ian Cordasco2015-10-081-1/+1
|\ \
| * | Use general null check for JSONCory Benfield2015-10-081-1/+1
| |/
* | Merge pull request #2812 from Lukasa/issue/2811Ian Cordasco2015-10-081-1/+4
|\ \ | |/ |/|
| * NewConnectionErrors aren't timeouts.Cory Benfield2015-10-081-1/+4
|/
* Merge pull request #2804 from Lukasa/final-2.8.0v2.8.0Ian Cordasco2015-10-0512-67/+123
|\
| * Changelog for #2785.Cory Benfield2015-10-051-0/+2
| * Increment version numbers.Cory Benfield2015-10-051-2/+2
| * Prepare changelog for 2.8.0Cory Benfield2015-10-051-0/+35
| * Update urllib3 to 1.12Cory Benfield2015-10-0510-65/+84
* | Merge pull request #2803 from asieira/masterIan Cordasco2015-10-051-27/+1
|\ \
| * | Removing change to .gitignore (#2785)Alexandre Sieira2015-10-051-1/+0
| * | Update default user-agent (#2785)Alexandre Sieira2015-10-052-27/+2
| |/
* | Merge pull request #2721 from Lukasa/no_proxy_fixCory Benfield2015-10-051-1/+3
|\ \
| * | Ignore empty fields in no_proxyCory Benfield2015-08-131-1/+3
* | | Merge pull request #2763 from ravipra/json_supersedesCory Benfield2015-10-052-2/+9
|\ \ \ | |_|/ |/| |
| * | Removed the other 'encode' as well, in the test case.Ravi Prakash Putchala2015-09-091-1/+1
| * | changed the null check for 'data' parameter to be more explicit.Ravi Prakash Putchala2015-09-092-2/+2
| * | Fixed issue #2756Ravi Prakash Putchala2015-09-082-2/+9