# HG changeset patch
# User Stephen Thorne <stephen@thorne.id.au>
# Date 2011-06-14 03:31:32
# Node ID 64dfbe5764558ddf3e0fa100467450977a0804ad
# Parent  9fba795dd030ba10fed2f2932b7c8338f489264a

sslutil: Restore missing imports of socket and httplib to sslutil

Two imports were omitted in the restructure of the code creating
sslutil.py, socket and httplib are required when the 'ssl' module
cannot be imported, restoring these imports allows mercurial to run
on python2.4+2.5.

diff --git a/mercurial/sslutil.py b/mercurial/sslutil.py
--- a/mercurial/sslutil.py
+++ b/mercurial/sslutil.py
@@ -18,6 +18,8 @@ try:
 except ImportError:
     CERT_REQUIRED = 2
 
+    import socket, httplib
+
     def ssl_wrap_socket(sock, key_file, cert_file,
                         cert_reqs=CERT_REQUIRED, ca_certs=None):
         if ca_certs: