Mercurial > hg
changeset 19808:3b82d412e9e8
sslutil: make keyfile and certfile arguments consistent between 2.6+ and 2.5-
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Fri, 20 Sep 2013 09:15:43 -0400 |
| parents | c48df403caae |
| children | 50d721553198 |
| files | mercurial/sslutil.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/sslutil.py Fri Sep 20 09:15:09 2013 -0400 +++ b/mercurial/sslutil.py Fri Sep 20 09:15:43 2013 -0400 @@ -34,7 +34,7 @@ import socket, httplib - def ssl_wrap_socket(sock, key_file, cert_file, ssl_version=PROTOCOL_TLSv1, + def ssl_wrap_socket(sock, keyfile, certfile, ssl_version=PROTOCOL_TLSv1, cert_reqs=CERT_REQUIRED, ca_certs=None): if not util.safehasattr(socket, 'ssl'): raise util.Abort(_('Python SSL support not found')) @@ -42,7 +42,7 @@ raise util.Abort(_( 'certificate checking requires Python 2.6')) - ssl = socket.ssl(sock, key_file, cert_file) + ssl = socket.ssl(sock, keyfile, certfile) return httplib.FakeSocket(sock, ssl) def _verifycert(cert, hostname):