summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use pyenv to install all versions of Python for macOS; update Python3 versionshaikuginger-fix-travis-macos-2.7Jesse Shapiro2017-12-111-8/+8
* Merge pull request #1281 from tomplus/masterCory Benfield2017-11-271-2/+2
|\
| * Merge branch 'master' into masterTomasz Prus2017-11-273-5/+6
| |\ | |/ |/|
* | Merge pull request #1284 from alex/patch-1Cory Benfield2017-11-213-5/+6
|\ \
| * | Do not use bare exceptAlex Gaynor2017-11-211-1/+1
| * | Do not use bare exceptAlex Gaynor2017-11-211-1/+1
| * | Skip this too without IPV6Alex Gaynor2017-11-201-0/+1
| * | Removed unused importAlex Gaynor2017-11-201-1/+0
| * | Don't try to run IPv6 tests if IPv6 is disabled at runtimeAlex Gaynor2017-11-201-2/+3
|/ /
| * doc: fix examples with urllib3.RetryTomasz Prus2017-11-071-2/+2
|/
* Merge pull request #1276 from jdufresne/wheel-licenseIan Stapleton Cordasco2017-10-221-0/+1
|\
| * Include license file in the generated wheel packageJon Dufresne2017-10-211-0/+1
|/
* Merge pull request #1277 from nattofriends/patch-1Cory Benfield2017-10-201-1/+1
|\
| * Merge branch 'master' into patch-1Cory Benfield2017-10-191-6/+0
| |\ | |/ |/|
* | Merge pull request #1278 from Lukasa/fix-appveyor-26Cory Benfield2017-10-191-6/+0
|\ \
| * | Fix AppveyorCory Benfield2017-10-191-6/+0
| * | Merge branch 'master' of https://github.com/shazow/urllib3.gitCory Benfield2017-10-1973-1895/+4738
| |\ \ | |/ / |/| |
| * | Merge branch 'master' of git@github.com:shazow/urllib3.gitCory Benfield2017-02-2671-577/+3245
| |\ \
| * \ \ Merge branch 'scop-close'Cory Benfield2016-09-054-13/+16
| |\ \ \
| | | | * Update SNIMissingWarning textnattofriends2017-10-181-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #1270 from igalic/lazyload-uuidCory Benfield2017-09-212-1/+10
|\ \ \ \
| * | | | lazily load uuid lib only where neededIgor Galić2017-09-202-1/+10
|/ / / /
* | | | Merge pull request #1259 from reversefold/dummyserver-decode-fixupsCory Benfield2017-09-151-4/+4
|\ \ \ \
| * | | | Fix dummyserver decode errors when defaults are used with Python 3Justin Patrin2017-09-101-4/+4
|/ / / /
* | | | Merge pull request #1261 from reversefold/tox-posargsCory Benfield2017-09-101-1/+1
|\ \ \ \
| * | | | Pass {posargs} to py.test so arguments can be passed through toxJustin Patrin2017-09-091-1/+1
|/ / / /
* | | | Merge pull request #1265 from reversefold/gaeCory Benfield2017-09-071-1/+4
|\ \ \ \
| * | | | Support newer versions of the google appengine sdk which move the sandbox mod...Justin Patrin2017-09-061-1/+4
|/ / / /
* | | | Merge pull request #1248 from itziakos/masterCory Benfield2017-08-306-17/+47
|\ \ \ \
| * | | | Accept long integers in `_fileobj_to_fd`Ioannis Tziakos2017-08-303-1/+9
| * | | | Fixed appveyor setup to run tests on using the 64bit PythonsIoannis Tziakos2017-08-303-16/+38
|/ / / /
* | | | Merge pull request #1251 from mikeage/add_portCory Benfield2017-08-263-4/+9
|\ \ \ \
| * | | | Simplify debug printMike Miller2017-08-261-4/+2
| * | | | Update CONTRIBUTORS and CHANGESMike Miller2017-08-252-0/+5
| * | | | Always print the port (even if it's the standard 80/443)Mike Miller2017-08-251-4/+4
| * | | | Add port to connection open print if it's non standard (not 80 or 443)Mike Miller2017-08-251-4/+6
|/ / / /
* | | | Merge pull request #1246 from rtdean/theonewolf-1060-pyopenssl-load-chain-fixCory Benfield2017-08-1611-1/+166
|\ \ \ \
| * | | | dummyserver/server.py: simlify import ssl strategyRyan T. Dean2017-08-161-6/+2
| * | | | update CHANGES.rst with quick description of #1060Ryan T. Dean2017-08-161-0/+3
| * | | | fix up tests and dummyserver /certificate endpointRyan T. Dean2017-08-153-11/+17
| * | | | test/with_dummyserver/test_https.py: addressing code reviewWolfgang Richter2017-08-102-8/+14
| * | | | test/with_dummyserver/test_https.py: corrected OS X error stringWolfgang Richter2017-08-101-1/+1
| * | | | test/with_dummyserver/test_https.py: adding error string for Mac platformWolfgang Richter2017-08-101-1/+2
| * | | | CONTRIBUTORS.txt: adding myself as authorWolfgang Richter2017-08-101-0/+3
| * | | | urllib3/contrib/pyopenssl.py: make the new intermediate client certificate te...Wolfgang Richter2017-08-101-1/+1
| * | | | test/with_dummyserver/test_https.py: adding intermediate CA client certificat...Wolfgang Richter2017-08-103-0/+46
| * | | | dummyserver/certs/client[_|_no_]intermediate.[key|pem]: adding client certifi...Wolfgang Richter2017-08-103-0/+71
| * | | | dummyserver/certs/intermediate.[crt|pem]: adding a testing intermediate CAWolfgang Richter2017-08-102-0/+33
|/ / / /
* | | | Merge pull request #1239 from alexwlchan/cover-more-raisesCory Benfield2017-08-103-0/+27
|\ \ \ \
| * | | | Pick off some easy coverage wins around raise statementsAlex Chan2017-08-103-0/+27
|/ / / /