diff options
| author | Andrey Petrov <shazow@gmail.com> | 2015-03-15 10:41:08 -0700 |
|---|---|---|
| committer | Andrey Petrov <shazow@gmail.com> | 2015-03-15 10:41:08 -0700 |
| commit | 58cd35eb8eb1108d56ffc00e48c79a2888526daa (patch) | |
| tree | 309319c54ebedfca8a2904daa1a7b81488adcfe7 | |
| parent | 941f65f810ce9c3d0dcbb17662e01b4264758ac0 (diff) | |
| parent | 4f3961897a741b1bb223590737e9f0d4886b8967 (diff) | |
| download | urllib3-58cd35eb8eb1108d56ffc00e48c79a2888526daa.tar.gz | |
Merge pull request #570 from akanouras/patch-1
Properly detect Python 3.0-3.1 in SSLContext.
| -rw-r--r-- | urllib3/util/ssl_.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/urllib3/util/ssl_.py b/urllib3/util/ssl_.py index e7e7dfae..8be221c0 100644 --- a/urllib3/util/ssl_.py +++ b/urllib3/util/ssl_.py @@ -40,7 +40,8 @@ except ImportError: import sys class SSLContext(object): # Platform-specific: Python 2 & 3.1 - supports_set_ciphers = sys.version_info >= (2, 7) + supports_set_ciphers = ((2, 7) <= sys.version_info < (3,) or + (3, 2) <= sys.version_info) def __init__(self, protocol_version): self.protocol = protocol_version |