# HG changeset patch # User Benoit Boissinot # Date 1266253970 -3600 # Node ID 95265afff99fec598ef35fea7473f13319639c23 # Parent 3062af0ba1774960f004ad15fb1a99d7881872f1 url: fix python < 2.6 with ssl installed _GLOBAL_DEFAULT_TIMEOUT isn't related to ssl, but to python < 2.6, move it to the right hunk. diff -r 3062af0ba177 -r 95265afff99f mercurial/url.py --- a/mercurial/url.py Mon Feb 15 09:57:11 2010 +0100 +++ b/mercurial/url.py Mon Feb 15 18:12:50 2010 +0100 @@ -268,11 +268,11 @@ ssl = socket.ssl(sock, key_file, cert_file) return httplib.FakeSocket(sock, ssl) - _GLOBAL_DEFAULT_TIMEOUT = object() - try: _create_connection = socket.create_connection except AttributeError: + _GLOBAL_DEFAULT_TIMEOUT = object() + def _create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT, source_address=None): # lifted from Python 2.6