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.
tests: collapse elif PYTHON3 block
authorGregory Szorc <gregory.szorc@gmail.com>
Sun, 20 Feb 2022 13:19:21 -0700
changeset 48858 9d01ab54df3f
parent 48857 41c552a20716
child 48859 f928dec9add7
tests: collapse elif PYTHON3 block PYTHON3 is always True now so this logic should be identical as to before. Differential Revision: https://phab.mercurial-scm.org/D12236
tests/run-tests.py file | annotate | diff | comparison | revisions 
--- a/tests/run-tests.py	Sun Feb 20 13:16:44 2022 -0700
+++ b/tests/run-tests.py	Sun Feb 20 13:19:21 2022 -0700
@@ -278,12 +278,11 @@
     except socket.error as exc:
         if WINDOWS and exc.errno == errno.WSAEACCES:
             return False
-        elif PYTHON3:
-            # TODO: make a proper exception handler after dropping py2.  This
-            #       works because socket.error is an alias for OSError on py3,
-            #       which is also the baseclass of PermissionError.
-            if isinstance(exc, PermissionError):
-                return False
+        # TODO: make a proper exception handler after dropping py2.  This
+        #       works because socket.error is an alias for OSError on py3,
+        #       which is also the baseclass of PermissionError.
+        elif isinstance(exc, PermissionError):
+            return False
         if exc.errno not in (
             errno.EADDRINUSE,
             errno.EADDRNOTAVAIL,
mercurial