Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sslutil: make keyfile and certfile arguments consistent between 2.6+ and 2.5-
authorAugie Fackler <raf@durin42.com>
Fri, 20 Sep 2013 09:15:43 -0400
changeset 19808 3b82d412e9e8
parent 19807 c48df403caae
child 19809 50d721553198
sslutil: make keyfile and certfile arguments consistent between 2.6+ and 2.5-
mercurial/sslutil.py file | annotate | diff | comparison | revisions 
--- 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):
mercurial