# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2011-09-28 18:57:48
# Node ID f3edee8dc40c9651bde76506e7e15e7132eece6c
# Parent  85322c19c8311ab6243ea9bb72ac1b6c003adb04
# Parent  b2d4400398f379dd7865ffa7f5424fd826509ee2

merge with crew

diff --git a/mercurial/sslutil.py b/mercurial/sslutil.py
--- a/mercurial/sslutil.py
+++ b/mercurial/sslutil.py
@@ -22,6 +22,8 @@ except ImportError:
 
     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'))