Mercurial > public > mercurial-scm > hg
diff mercurial/url.py @ 25429:9d1c61715939
ssl: rename ssl_wrap_socket() to conform to our naming convention
I've removed ssl_ prefix because the module name contains ssl.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Fri, 05 Jun 2015 21:25:28 +0900 |
| parents | 21b536f01eda |
| children | 328739ea70c3 |
line wrap: on
line diff
--- a/mercurial/url.py Fri Jun 05 07:49:06 2015 +0900 +++ b/mercurial/url.py Fri Jun 05 21:25:28 2015 +0900 @@ -175,8 +175,8 @@ self.sock.connect((self.host, self.port)) if _generic_proxytunnel(self): # we do not support client X.509 certificates - self.sock = sslutil.ssl_wrap_socket(self.sock, None, None, None, - serverhostname=self.host) + self.sock = sslutil.wrapsocket(self.sock, None, None, None, + serverhostname=self.host) else: keepalive.HTTPConnection.connect(self) @@ -338,7 +338,7 @@ if self.realhostport: # use CONNECT proxy _generic_proxytunnel(self) host = self.realhostport.rsplit(':', 1)[0] - self.sock = sslutil.ssl_wrap_socket( + self.sock = sslutil.wrapsocket( self.sock, self.key_file, self.cert_file, serverhostname=host, **sslutil.sslkwargs(self.ui, host)) sslutil.validator(self.ui, host)(self.sock)