Patchwork sslutil: fix comment to use inclusive or instead of exclusive or

login
register
mail settings
Submitter Manuel Jacob
Date June 1, 2020, 1:22 p.m.
Message ID <cdda90fe3db504047201.1591017760@tmp>
Download mbox | patch
Permalink /patch/46449/
State Accepted
Headers show

Comments

Manuel Jacob - June 1, 2020, 1:22 p.m.
# HG changeset patch
# User Manuel Jacob <me@manueljacob.de>
# Date 1591017751 -7200
#      Mon Jun 01 15:22:31 2020 +0200
# Node ID cdda90fe3db5040472014c980385fba69f37ad76
# Parent  d61c05450b378372437b8ea499ff43ce0b7f5cb3
sslutil: fix comment to use inclusive or instead of exclusive or

The incorrect "either" was introduced by one of my recent patches.
Yuya Nishihara - June 1, 2020, 2:02 p.m.
On Mon, 01 Jun 2020 15:22:40 +0200, Manuel Jacob wrote:
> # HG changeset patch
> # User Manuel Jacob <me@manueljacob.de>
> # Date 1591017751 -7200
> #      Mon Jun 01 15:22:31 2020 +0200
> # Node ID cdda90fe3db5040472014c980385fba69f37ad76
> # Parent  d61c05450b378372437b8ea499ff43ce0b7f5cb3
> sslutil: fix comment to use inclusive or instead of exclusive or

Queued for default, thanks.

Patch

diff --git a/mercurial/sslutil.py b/mercurial/sslutil.py
--- a/mercurial/sslutil.py
+++ b/mercurial/sslutil.py
@@ -104,8 +104,8 @@  def _hostsettings(ui, hostname):
     # BEAST and POODLE). We allow users to downgrade to TLS 1.0+ via config
     # options in case a legacy server is encountered.
 
-    # setup.py checks that either TLS 1.1 or TLS 1.2 is present, so the
-    # following assert should not fail.
+    # setup.py checks that TLS 1.1 or TLS 1.2 is present, so the following
+    # assert should not fail.
     assert supportedprotocols - {b'tls1.0'}
     defaultminimumprotocol = b'tls1.1'