# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1317236268 18000
# Node ID f3edee8dc40c9651bde76506e7e15e7132eece6c
# Parent  85322c19c8311ab6243ea9bb72ac1b6c003adb04# Parent  b2d4400398f379dd7865ffa7f5424fd826509ee2
merge with crew

diff -r 85322c19c831 -r f3edee8dc40c mercurial/sslutil.py
--- 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'))