summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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
| * | | Test cases fail when `HTTPBIN_URL` does not have trailing slashDavid Pursehouse2013-07-231-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | Test cases can be run against a local httpbin server defined by the `HTTPBIN_URL` environment variable, but it causes tests to fail if the given URL does not end with a slash. Ensure that the URL always ends with a slash.
* | | Merge pull request #1479 from dpursehouse/fix-warningsKenneth Reitz2013-07-222-3/+2
|\ \ \ | | | | | | | | Fix a few warnings flagged by PyDev
| * | | Fix a few warnings flagged by PyDevDavid Pursehouse2013-07-222-3/+2
|/ / / | | | | | | | | | | | | | | | - Unused import of urlparse - Unnecessary definition of variable - Incorrect indentation
* | | Merge pull request #1478 from dpursehouse/add-me-to-authorsKenneth Reitz2013-07-221-0/+1
|\ \ \ | | | | | | | | Add myself to the authors list
| * | | Add myself to the authors listDavid Pursehouse2013-07-221-0/+1
|/ / /
* | | Merge pull request #1477 from dpursehouse/other-auth-basic-exampleCory Benfield2013-07-211-4/+18
|\ \ \ | |/ / |/| | Add a simple example of custom authentication in the documentation
| * | Add a simple example of custom authentication in the documentationDavid Pursehouse2013-07-221-2/+14
| | | | | | | | | | | | Refs #1471
| * | Wrap long lines in the authentication documentationDavid Pursehouse2013-07-221-2/+4
|/ /
* | Merge pull request #1474 from Kwpolska/docfixKenneth Reitz2013-07-208-23/+24
|\ \ | | | | | | Some tiny fixes to the documentation
| * | further treatmentKwpolska2013-07-201-1/+1
| | | | | | | | | | | | Signed-off-by: Kwpolska <kwpolska@gmail.com>
| * | session object should be uppercaseKwpolska2013-07-201-2/+2
| | | | | | | | | | | | Signed-off-by: Kwpolska <kwpolska@gmail.com>
| * | fixed underlineKwpolska2013-07-201-1/+1
| | | | | | | | | | | | Signed-off-by: Kwpolska <kwpolska@gmail.com>
| * | Grammar fixes and suchKwpolska2013-07-205-8/+9
| | | | | | | | | | | | Signed-off-by: Kwpolska <kwpolska@gmail.com>
| * | Some cosmetic updates to the docsKwpolska2013-07-206-11/+11
|/ / | | | | | | Signed-off-by: Kwpolska <kwpolska@gmail.com>
* | Merge pull request #1470 from Lukasa/carsetCory Benfield2013-07-191-3/+3
|\ \ | | | | | | Remove charset from JSON types: not valid.
| * | Remove charset from JSON types: not valid.Cory Benfield2013-07-191-3/+3
| | |
* | | Merge pull request #1465 from dpursehouse/doc-netrc-authenticationCory Benfield2013-07-191-0/+11
|\ \ \ | |/ / |/| | Improve documentation of netrc authentication
| * | Move netrc authentication documentation under the Basic Auth sectionDavid Pursehouse2013-07-191-11/+11
| | |
| * | Improve documentation of netrc authenticationDavid Pursehouse2013-07-191-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation does not make it clear that when the credentials from netrc are used, Requests authenticates with HTTP Basic Auth. I just spent ages trying to figure out why it wasn't working, and it was because although the credentials in the netrc were correct, the server actually required HTTP Digest Auth. Add a section in the authentication documentation to make it clear that HTTP Basic Auth is used.
* | | Merge pull request #1466 from s7v7nislands/fix_docCory Benfield2013-07-193-9/+4
|\ \ \ | |/ / |/| | Fix doc
| * | merges7v7nislands2013-07-1912-23/+73
| |\ \ | |/ / |/| |
* | | Merge pull request #1464 from dpursehouse/document-none-not-sentCory Benfield2013-07-191-0/+3
|\ \ \ | | | | | | | | Fix #1322: Add note in docs about None not being sent as data
| * | | Fix #1322: Add note in docs about None not being sent as dataDavid Pursehouse2013-07-191-0/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case: payload = {'key1': 'value1', 'key2': 'value2', 'key3': None} r = requests.get("http://httpbin.org", params=payload) the parameter `key3` will not be sent as a parameter in the URL. Mention this in the documentation.
* | | Merge pull request #1463 from AudriusButkevicius/masterKenneth Reitz2013-07-184-19/+24
|\ \ \ | | | | | | | | Update urllib3 to a43319f
| * | | Update urllib3 to a43319fAudrius Butkevicius2013-07-184-19/+24
|/ / /