diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-05 21:40:07 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-05 21:40:07 (GMT) |
| commit | 04f6a32dff60d6f22b56b887338dd6ebbdc68dfe (patch) | |
| tree | 1a8163e2cb9880e4502ac3dbbda2cdcd9e0d0e3a /Lib/ssl.py | |
| parent | c50846aaef3e38d466ac9a0a87f72f09238e2061 (diff) | |
| download | cpython-04f6a32dff60d6f22b56b887338dd6ebbdc68dfe.zip cpython-04f6a32dff60d6f22b56b887338dd6ebbdc68dfe.tar.gz cpython-04f6a32dff60d6f22b56b887338dd6ebbdc68dfe.tar.bz2 | |
Merged revisions 79812 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79812 | antoine.pitrou | 2010-04-05 23:35:07 +0200 (lun., 05 avril 2010) | 5 lines
Issue #8321: Give access to OpenSSL version numbers from the `ssl` module,
using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO`
and `ssl.OPENSSL_VERSION_NUMBER`.
........
Diffstat (limited to 'Lib/ssl.py')
| -rw-r--r-- | Lib/ssl.py | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -58,6 +58,7 @@ import textwrap import _ssl # if we can't import it, let the error propagate +from _ssl import OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_INFO, OPENSSL_VERSION from _ssl import SSLError from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED from _ssl import (PROTOCOL_SSLv2, PROTOCOL_SSLv3, PROTOCOL_SSLv23, |