Mercurial > hg-stable

changeset 48958:f547a5dee234

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unconditionalize some imports Now that we require Python 3 we can simplify these imports. Differential Revision: https://phab.mercurial-scm.org/D12245
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 20 Feb 2022 13:29:47 -0700
parents 2ccd5e71bcd3
children a52f5bfc9358
files tests/run-tests.py
diffstat 1 files changed, 3 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/tests/run-tests.py	Sun Feb 20 13:27:38 2022 -0700
+++ b/tests/run-tests.py	Sun Feb 20 13:29:47 2022 -0700
@@ -57,8 +57,10 @@
 import multiprocessing
 import os
 import platform
+import queue
 import random
 import re
+import shlex
 import shutil
 import signal
 import socket
@@ -73,20 +75,7 @@
 import xml.dom.minidom as minidom
 
 WINDOWS = os.name == r'nt'
-
-try:
-    import Queue as queue
-except ImportError:
-    import queue
-
-try:
-    import shlex
-
-    shellquote = shlex.quote
-except (ImportError, AttributeError):
-    import pipes
-
-    shellquote = pipes.quote
+shellquote = shlex.quote
 
 
 processlock = threading.Lock()