Mercurial > hg-stable
diff tests/hghave @ 12784:763be3cd084a
hgweb: use Pythons ssl module for HTTPS serve when using Python 2.6 or later
pyOpenSSL apparently doesn't work for Python 2.7 and isn't very actively
maintained.
The built-in ssl module seems like a long-term winner, so we now use that with
Python 2.6 and higher.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 20 Oct 2010 20:19:34 +0200 |
parents | b86c6954ec4c |
children | 58b26b360a57 |
line wrap: on
line diff
--- a/tests/hghave Wed Oct 20 20:19:32 2010 +0200 +++ b/tests/hghave Wed Oct 20 20:19:34 2010 +0200 @@ -181,7 +181,6 @@ def has_ssl(): try: - from OpenSSL.SSL import SysCallError, ZeroReturnError import ssl return True except ImportError: @@ -207,7 +206,7 @@ "outer-repo": (has_outer_repo, "outer repo"), "p4": (has_p4, "Perforce server and client"), "pygments": (has_pygments, "Pygments source highlighting library"), - "ssl": (has_ssl, "python ssl and openssl modules"), + "ssl": (has_ssl, "python >= 2.6 ssl module"), "svn": (has_svn, "subversion client and admin tools"), "svn-bindings": (has_svn_bindings, "subversion python bindings"), "symlink": (has_symlink, "symbolic links"),