Mercurial > hg
changeset 15161:f3edee8dc40c
merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 28 Sep 2011 13:57:48 -0500 |
parents | 85322c19c831 (current diff) b2d4400398f3 (diff) |
children | d67a15b2e608 |
files | |
diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/sslutil.py Tue Sep 27 18:50:18 2011 -0500 +++ b/mercurial/sslutil.py Wed Sep 28 13:57:48 2011 -0500 @@ -22,6 +22,8 @@ def ssl_wrap_socket(sock, key_file, cert_file, cert_reqs=CERT_REQUIRED, ca_certs=None): + if not util.safehasattr(socket, 'ssl'): + raise util.Abort(_('Python SSL support not found')) if ca_certs: raise util.Abort(_( 'certificate checking requires Python 2.6'))