summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* depend on twistedtwistedKenneth Reitz2017-09-031-1/+2
| | | | Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
* more python2 compatibilityKenneth Reitz2017-09-031-2/+2
| | | | Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
* cleanupKenneth Reitz2017-09-031-11/+16
| | | | Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
* all working!Kenneth Reitz2017-09-031-6/+28
| | | | Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
* this is a nightmare™Kenneth Reitz2017-09-032-1/+39
| | | | Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
* Merge pull request #4118 from hobarrera/drop-py26Kenneth Reitz2017-07-2618-65/+41
|\ | | | | Drop python2.6 support
| * Use comprehensions whenever possibleHugo Osvaldo Barrera2017-07-147-25/+22
| |
| * Keep an eye open on forward-compatibilityHugo Osvaldo Barrera2017-07-141-0/+3
| |
| * Add myself to AUTHORSHugo Osvaldo Barrera2017-07-141-1/+1
| | | | | | | | (Or rather, just update my email)
| * Drop python2.6 supportHugo Osvaldo Barrera2017-07-1411-39/+15
|/
* Merge pull request #4173 from jeremycline/https-proxy-issueCory Benfield2017-06-272-79/+270
|\ | | | | Pass pool_kwargs rather than updating connection_pool_kw
| * Remove the dictionary comprehension from the testsJeremy Cline2017-06-271-2/+4
| | | | | | | | Signed-off-by: Jeremy Cline <jeremy@jcline.org>
| * Move _pool_kwargs out to a functionJeremy Cline2017-06-261-64/+62
| | | | | | | | Signed-off-by: Jeremy Cline <jeremy@jcline.org>
| * Pass pool_kwargs rather than updating connection_pool_kwJeremy Cline2017-06-241-39/+34
| | | | | | | | | | | | | | | | | | This addresses an issue where making HTTPS through proxies used the default urllib3 connection pool settings. fixes #3633 Signed-off-by: Jeremy Cline <jeremy@jcline.org>
| * Tests to demonstrate issue #3633Jeremy Cline2017-06-241-0/+196
|/ | | | Signed-off-by: Jeremy Cline <jeremy@jcline.org>
* Merge pull request #4120 from requests/update-3.0Cory Benfield2017-06-10136-32595/+626
|\ | | | | Bring 3.0 up-to-date with master.
| * This should be 3.0update-3.0Cory Benfield2017-05-311-2/+2
| |
| * Clean up invalid indentation from mergeCory Benfield2017-05-311-1/+1
| |
| * Clean up flake8 errors from mergeCory Benfield2017-05-313-3/+5
| |
| * Clean up messy mergeCory Benfield2017-05-311-2/+3
| |
| * Merge branch 'master' into proposed/3.0.0Cory Benfield2017-05-31136-32593/+621
| |\ |/ /
| * Merge pull request #4114 from cyberjacob/masterCory Benfield2017-05-302-2/+9
| |\ | | | | | | Catch error if multiprocessing is not available or is unable to determine the number of CPUs
| | * Catch error if multiprocessing is not available or is unable to determine ↵Jacob Mansfield2017-05-302-2/+9
| |/ | | | | | | the number of CPUs
| * Begin dev section of READMECory Benfield2017-05-301-0/+5
| |
| * change development philosophy docs to reflect realityKenneth Reitz2017-05-291-2/+2
| |
| * remove note about cacerts.pemKenneth Reitz2017-05-291-5/+0
| |
| * improve development instructionsKenneth Reitz2017-05-291-1/+1
| |
| * update development documentationKenneth Reitz2017-05-291-4/+7
| |
| * remove "are you crazy?" sectionKenneth Reitz2017-05-291-5/+0
| |
| * fix sidebarsKenneth Reitz2017-05-292-2/+2
| |
| * improve installation docsKenneth Reitz2017-05-291-2/+2
| |
| * improve install docsKenneth Reitz2017-05-291-2/+2
| |
| * fix github starsKenneth Reitz2017-05-291-1/+1
| |
| * improve installation instructionsKenneth Reitz2017-05-291-1/+2
| |
| * Merge branch 'master' of github.com:kennethreitz/requestsKenneth Reitz2017-05-2911-45/+39
| |\
| | * Merge pull request #4108 from requests/flake8-improvementsKenneth Reitz2017-05-2911-45/+39
| | |\ | | | | | | | | flake8 improvements
| | | * cleanup utils.pyKenneth Reitz2017-05-291-2/+3
| | | |
| | | * cleanup sessions.pyKenneth Reitz2017-05-291-26/+15
| | | |
| | | * cleanup models.pyKenneth Reitz2017-05-291-4/+6
| | | |
| | | * improve flake8 help.pyKenneth Reitz2017-05-291-1/+0
| | | |
| | | * cleanup help.py (flake8)flake8-improvementsKenneth Reitz2017-05-291-1/+3
| | | |
| | | * improve line continuations for flake8Kenneth Reitz2017-05-291-2/+4
| | | |
| | | * fix empty lines for flake8Kenneth Reitz2017-05-291-0/+1
| | | |
| | | * fix flake8 indent errorKenneth Reitz2017-05-291-1/+1
| | | |
| | | * ignore undefined names in flake8Kenneth Reitz2017-05-291-1/+1
| | | |
| | | * flake8 ignore lambda expressionsKenneth Reitz2017-05-291-1/+1
| | | |
| | | * fix spaces in api.pyKenneth Reitz2017-05-291-1/+1
| | | |
| | | * fix flake8 for EOF in __init__.pyKenneth Reitz2017-05-291-2/+0
| | | |
| | | * flake8: import statement improvementsKenneth Reitz2017-05-292-5/+5
| | | |
| | | * ignore line continuations for flake8Kenneth Reitz2017-05-291-1/+1
| | | |
View Lorry Controller Status