# HG changeset patch # User Gregory Szorc # Date 1464632383 25200 # Node ID a05a91a3f120946fcd330b117d3b7e87efcf7fb4 # Parent 63a3749147afc9b7649713c369467a2aed336297 sslutil: remove "strict" argument from validatesocket() It was only used by mail.py as part of processing smtp.verifycert, which was just removed. diff -r 63a3749147af -r a05a91a3f120 mercurial/sslutil.py --- a/mercurial/sslutil.py Sat Jun 04 11:13:28 2016 -0700 +++ b/mercurial/sslutil.py Mon May 30 11:19:43 2016 -0700 @@ -324,7 +324,7 @@ return None -def validatesocket(sock, strict=False): +def validatesocket(sock): """Validate a socket meets security requiremnets. The passed socket must have been created with ``wrapsocket()``. @@ -386,17 +386,10 @@ return if not sock._hgstate['caloaded']: - if strict: - raise error.Abort(_('%s certificate with fingerprint %s not ' - 'verified') % (host, nicefingerprint), - hint=_('check %s or web.cacerts config ' - 'setting') % section) - else: - ui.warn(_('warning: %s certificate with fingerprint %s ' - 'not verified (check %s or web.cacerts config ' - 'setting)\n') % - (host, nicefingerprint, section)) - + ui.warn(_('warning: %s certificate with fingerprint %s ' + 'not verified (check %s or web.cacerts config ' + 'setting)\n') % + (host, nicefingerprint, section)) return msg = _verifycert(peercert2, host)