[Updated] D12245: tests: unconditionalize some imports

[indygreg (Gregory Szorc)]

Closed by commit rHGf547a5dee234: tests: unconditionalize some imports (authored by indygreg).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D12245?vs=32320&id=32483

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D12245/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D12245

AFFECTED FILES
  tests/run-tests.py

CHANGE DETAILS

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -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()



To: indygreg, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220303/5a2e5e27/attachment-0002.html>