diff mercurial/sslutil.py @ 14616:64dfbe576455

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.

--- a/mercurial/sslutil.py	Wed Jun 08 14:54:47 2011 +0300
+++ b/mercurial/sslutil.py	Tue Jun 14 13:31:32 2011 +1000
@@ -18,6 +18,8 @@
 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: