Patchwork [3,of,6] httpconnection: remove use of sslkwargs

login
register
mail settings
Submitter Gregory Szorc
Date May 26, 2016, 3:03 a.m.
Message ID <de1d20a7379deb5289e2.1464231832@ubuntu-vm-main>
Download mbox | patch
Permalink /patch/15214/
State Accepted
Headers show

Comments

Gregory Szorc - May 26, 2016, 3:03 a.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1464231246 25200
#      Wed May 25 19:54:06 2016 -0700
# Node ID de1d20a7379deb5289e2d12d73352c16470b0358
# Parent  f57cb70979b5399f7d5543de268e6eb79fdcd51f
httpconnection: remove use of sslkwargs

It now does nothing.

Patch

diff --git a/mercurial/httpconnection.py b/mercurial/httpconnection.py
--- a/mercurial/httpconnection.py
+++ b/mercurial/httpconnection.py
@@ -275,16 +275,14 @@  class http2handler(urlreq.httphandler, u
             host, port = host.rsplit(':', 1)
             port = int(port)
             if '[' in host:
                 host = host[1:-1]
 
         kwargs['keyfile'] = keyfile
         kwargs['certfile'] = certfile
 
-        kwargs.update(sslutil.sslkwargs(self.ui, host))
-
         con = HTTPConnection(host, port, use_ssl=True,
                              ssl_wrap_socket=sslutil.wrapsocket,
                              ssl_validator=sslutil.validatesocket,
                              ui=self.ui,
                              **kwargs)
         return con