summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* The expected value changes for the proxies keywordfix-redirect-testIan Cordasco2014-03-261-1/+1
* Merge pull request #1962 from sigmavirus24/fix-history-typeKenneth Reitz2014-03-242-1/+11
|\
| * Actually assign historyIan Cordasco2014-03-151-0/+1
| * Fix #1960: A Response's history should be a listIan Cordasco2014-03-152-1/+10
* | Merge pull request #1963 from sigmavirus24/fix-redirect-methodsKenneth Reitz2014-03-242-1/+65
|\ \
| * | Fix #1955: Do not use original request in redirectIan Cordasco2014-03-152-1/+65
| |/
* | Merge remote-tracking branch 'origin/master'Kenneth Reitz2014-03-2414-81/+225
|\ \
| * \ Merge pull request #1951 from Lukasa/proxyauthKenneth Reitz2014-03-233-24/+102
| |\ \ | | |/ | |/|
| | * Style changes thanks to @sigmavirus24.Cory Benfield2014-03-221-8/+7
| | * Test stripping standard auth.Cory Benfield2014-03-121-0/+17
| | * Remove some extraneous comments to please KR.Cory Benfield2014-03-121-6/+0
| | * Add method for rebuilding proxy configuration.Cory Benfield2014-03-121-1/+51
| | * Move auth rebuild to its own method.Cory Benfield2014-03-121-13/+26
| | * Split get_environ_proxies into two methods.Cory Benfield2014-03-121-10/+15
| * | Merge pull request #1916 from schlamar/accept-encodingKenneth Reitz2014-03-121-1/+1
| |\ \
| | * | Removed compress from accepted encodings.schlamar2014-03-121-1/+1
| | |/
| * | Merge pull request #1949 from Lukasa/pickleKenneth Reitz2014-03-121-0/+1
| |\ \ | | |/ | |/|
| | * Ensure that .raw() is present after unpickling.Cory Benfield2014-03-121-0/+1
| |/
| * Timeout documentation changes.Cory Benfield2014-03-032-1/+5
| * Merge pull request #1935 from cjstapleton/masterKenneth Reitz2014-03-032-4/+9
| |\
| | * Fix styling issues with add timeout to stream with testingcjstapleton2014-02-281-2/+1
| | * Add timeout to stream with testingcjstapleton2014-02-282-4/+10
| * | Merge pull request #1921 from sigmavirus24/fix-session-header-noneKenneth Reitz2014-03-032-0/+10
| |\ \
| | * | Do not set headers with None valueIan Cordasco2014-02-142-0/+10
| * | | Merge pull request #1934 from kennethreitz/update-noticeCory Benfield2014-03-021-17/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Remove unnecessary bits from cacert notice sectionupdate-noticeIan Cordasco2014-03-011-8/+0
| | * | Charade -> Chardet and Add cacert.pem licenseIan Cordasco2014-02-281-17/+13
| |/ /
| * | Merge pull request #1923 from Lukasa/masterCory Benfield2014-02-162-2/+2
| |\ \ | | |/ | |/|
| | * The timeout is in seconds.Cory Benfield2014-02-162-2/+2
| |/
| * Merge pull request #1918 from zackw/response-is-redirectKenneth Reitz2014-02-135-13/+36
| |\
| | * New Response property, .is_redirect.Zack Weinberg2014-02-135-13/+36
| |/
| * Merge pull request #1891 from sigmavirus24/add-requests-to-exceptionsKenneth Reitz2014-02-112-9/+16
| |\
| | * Explicitly check for NoneIan Cordasco2014-01-281-1/+2
| | * Avoid having to fix testsIan Cordasco2014-01-281-2/+3
| | * Move creation of attributes to RequestExceptionIan Cordasco2014-01-282-9/+14
| * | Merge pull request #1897 from aliles/masterKenneth Reitz2014-02-112-0/+25
| |\ \
| | * | State early in SNI discussion Python2 limitationAaron Iles2014-02-041-2/+3
| | * | Move SNI documentation to FAQAaron Iles2014-02-022-25/+24
| | * | Document requirements for SNI support on Python2Aaron Iles2014-02-021-0/+25
| * | | Merge pull request #1900 from mjpieters/issue1674-json-fallback-encodingKenneth Reitz2014-02-111-1/+8
| |\ \ \
| | * | | Remove logging and charade mention.Martijn Pieters2014-02-031-3/+1
| | * | | Reinstate falling back to self.text for JSON responsesMartijn Pieters2014-02-031-2/+11
| * | | | Clarify our 1.2.1 behaviour change.Cory Benfield2014-02-111-0/+2
| * | | | Merge pull request #1902 from mjpieters/masterKenneth Reitz2014-02-062-6/+0
| |\ \ \ \
| | * | | | Remove unused loggers.Martijn Pieters2014-02-032-6/+0
| | | |/ / | | |/| |
| * | | | Merge pull request #1904 from mjpieters/doc-response-reasonCory Benfield2014-02-051-1/+2
| |\ \ \ \
| | * | | | Document the `Response.reason` attribute.Martijn Pieters2014-02-051-1/+2
| |/ / / /
| * | | | Merge pull request #1901 from mjpieters/chardet-not-charadeCory Benfield2014-02-041-2/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | One last Charade reference to remove here.Martijn Pieters2014-02-031-2/+1
| |/ / /
* | | | 3.4Kenneth Reitz2014-03-241-1/+1
|/ / /