summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1578 from jparise/jparise-authorsbaserock/morphCory Benfield2013-09-041-0/+1
|\ | | | | Adding myself to the list of contributors.
| * Adding myself to the list of contributors.Jon Parise2013-09-041-0/+1
|/
* Merge pull request #1575 from jparise/content-encodingKenneth Reitz2013-09-032-1/+49
|\ | | | | Improved content encoding detection.
| * Improved content encoding detection.Jon Parise2013-09-032-1/+49
|/ | | | | | | | | | | | get_encodings_from_content() can now detect HTML in-document content encoding declarations in the following formats: - HTML5 - HTML4 - XHTML 1.x served with text/html MIME type - XHTML 1.x served as XML Ref: http://www.w3.org/International/questions/qa-html-encoding-declarations
* Merge pull request #1566 from sigmavirus24/update_readmeCory Benfield2013-09-011-1/+3
|\ | | | | Add link to Contributor Friendly tag in README
| * Add link to Contributor Friendly tagIan Cordasco2013-09-011-1/+3
|/ | | | Add note that I'm willing to help anyone who is looking to submit a pull request
* Merge pull request #1556 from ssbarnea/masterCory Benfield2013-08-271-0/+1
|\ | | | | Added link to StackOverflow questions related to python-requests. This s...
| * Added link to StackOverflow questions related to python-requests. This ↵Sorin Sbarnea2013-08-271-0/+1
| | | | | | | | | | | | should be the default support way for the library, as clearly most questions are supposed to be programming related. Signed-off-by: Sorin Sbarnea <sorin.sbarnea@citrix.com>
* | Merge pull request #1540 from libbkmz/masterCory Benfield2013-08-181-1/+1
|\ \ | | | | | | Event hooks update
| * | Update advanced.rstlibbkmz2013-08-191-1/+1
|/ /
* | Merge pull request #1538 from enkore/patch-1Cory Benfield2013-08-171-1/+1
|\ \ | | | | | | Remove superfluous double dot
| * | Remove superfluous double dotenkore2013-08-181-1/+1
|/ /
* | Merge pull request #1535 from sigmavirus24/ignore_original_response_if_noneKenneth Reitz2013-08-161-0/+3
|\ \ | | | | | | Skip cookie extraction if necessary
| * | Skip cookie extraction if necessaryIan Cordasco2013-08-161-0/+3
|/ / | | | | | | | | If _original_response is never set/is None, then don't try to extract cookies from the response.
* | Merge pull request #1508 from dieterv/masterKenneth Reitz2013-07-311-3/+0
|\ \ | | | | | | remove duplicate comment
| * | remove duplicate commentDieter Verfaillie2013-07-311-3/+0
| | | | | | | | | This is already mentioned at line 357...
* | | Merge pull request #1500 from gavrie/master2.0Kenneth Reitz2013-07-314-13/+22
|\ \ \ | | | | | | | | Update urllib3 to d89d508
| * | | Update urllib3 to d89d508Gavrie Philipson2013-07-294-13/+22
| |/ /
* | | Merge pull request #1487 from ↵Kenneth Reitz2013-07-311-34/+15
|\ \ \ | | | | | | | | | | | | | | | | dpursehouse/rewrite-test_mixed_case_scheme_acceptable Rewrite test cases to remove dependency on httpbin.org and example.com
| * | | Check the response URL in `test_uppercase_scheme_redirect`David Pursehouse2013-07-241-0/+1
| | | | | | | | | | | | | | | | | | | | Update the test to check that the URL in the response is the one that we expect, i.e. the one it was supposed to redirect to.
| * | | Rewrite `test_uppercase_scheme_redirect` to use local httpbinDavid Pursehouse2013-07-241-1/+3
| | | | | | | | | | | | | | | | | | | | Instead of redirecting to hard-coded 'example.com', use the URL defined in `HTTPBIN_URL` with the path set to the 'html' endpoint.
| * | | Remove redundant test case `test_uppercase_scheme`David Pursehouse2013-07-241-4/+0
| | | | | | | | | | | | | | | | | | | | This test verifies that an upper case scheme ('HTTP') works correctly, but this is already tested in `test_mixed_case_scheme_acceptable`.
| * | | Rewrite `test_mixed_case_scheme_acceptable` to work with local httpbinDavid Pursehouse2013-07-241-25/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using hard-coded urls to httpbin.org, use the url defined in `HTTPBIN_URL` replacing the scheme as necessary to test the mixed cases. Refs #1485
| * | | Remove redundant session in `test_mixed_case_scheme_acceptable`David Pursehouse2013-07-241-4/+1
| | | |
* | | | Merge pull request #1498 from Lukasa/incompletereadKenneth Reitz2013-07-313-4/+16
|\ \ \ \ | | | | | | | | | | Wrap IncompleteRead in ChunkedEncodingError.
| * | | | Wrap IncompleteRead in ChunkedEncodingError.Cory Benfield2013-07-283-4/+16
| | |/ / | |/| |
* | | | Merge pull request #1501 from sigmavirus24/remove_setting_of_hooksKenneth Reitz2013-07-311-1/+0
|\ \ \ \ | | | | | | | | | | Fix duplication of efforts caught by @dofelw
| * | | | Fix duplication of efforts caught by @dofelwIan Cordasco2013-07-291-1/+0
| | | | |
* | | | | Merge pull request #1506 from Lukasa/mockrequestKenneth Reitz2013-07-311-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Provide 'host' parameter to MockRequest.
| * | | | | Provide 'host' parameter to MockRequest.Cory Benfield2013-07-301-0/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #1507 from buzztabapp/prepared-session-requestsKenneth Reitz2013-07-313-48/+98
|\ \ \ \ \ | |/ / / / |/| | | | Allow preparing of Requests from Session settings without sending.
| * | | | Merge settings when creating PreparedRequest, don't copy Request.Robert Estelle2013-07-313-87/+54
| | | | |
| * | | | Add Session.prepare_request test case.Robert Estelle2013-07-301-0/+17
| | | | |
| * | | | Add Request.copy() test case.Robert Estelle2013-07-301-0/+31
| | | | |
| * | | | Shallow copy of Request fields in Request.copy()Robert Estelle2013-07-301-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents e.g. modifying the headers of a copied request from affecting the headers of its source and vice versa. Copying is used with the intent to mutuate, so allowing this kind of mutation of fields makes sense. Is a deep copy better?
| * | | | Skip unneccessary Request.copy in Session.requestRobert Estelle2013-07-301-4/+6
| | | | |
| * | | | Prepare requests with session settings separately from sending.Robert Estelle2013-07-302-34/+61
|/ / / /
* | | | Merge pull request #1494 from Lukasa/closeCory Benfield2013-07-271-0/+5
|\ \ \ \ | | | | | | | | | | Document the Response.close() method.
| * | | | Document the Response.close() method.Cory Benfield2013-07-251-0/+5
| |/ / /
* | | | Merge pull request #1476 from sigmavirus24/add_copy_to_prepared_requestsKenneth Reitz2013-07-261-0/+9
|\ \ \ \ | |/ / / |/| | | [2.0] Add copy method to PreparedRequest objects
| * | | Add copy method to PreparedRequest objectsIan Cordasco2013-07-201-1/+10
| | | |
* | | | Comment markups, courtesy of @sigmavirus24Cory Benfield2013-07-241-2/+2
| | | |
* | | | Merge pull request #1490 from Lukasa/cookiedocsKenneth Reitz2013-07-241-1/+4
|\ \ \ \ | |_|/ / |/| | | Better cookie docs on sessions.
| * | | Better cookie docs on sessions.Cory Benfield2013-07-241-1/+4
|/ / /
* | | Merge pull request #1486 from sigmavirus24/use_urljoinKenneth Reitz2013-07-231-2/+2
|\ \ \ | | | | | | | | Use urlparse.urljointo construct httpbin url
| * | | Derp. Use compatIan Cordasco2013-07-231-3/+2
| | | |
| * | | Use urlparse.urljointo construct httpbin urlIan Cordasco2013-07-231-1/+2
|/ / /
* | | Merge pull request #1482 from dpursehouse/fix-testcases-with-proxyKenneth Reitz2013-07-232-2/+8
|\ \ \ | | | | | | | | Fix test cases that fail when running behind a proxy
| * | | Fix test cases that fail when running behind a proxyDavid Pursehouse2013-07-232-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sending a request via `Session.send()` the proxies must be explicitly given with the `proxies` argument. This is not done in the test cases, which means that they fail when run on a system that is behind a proxy. Update test cases to make sure the proxies are set in the sessions.
* | | | Merge pull request #1483 from dpursehouse/httpbin-url-without-trailing-slashKenneth Reitz2013-07-231-0/+2
|\ \ \ \ | |/ / / |/| | | Test cases fail when `HTTPBIN_URL` does not have trailing slash