[libcxx-commits] [libcxx] d3ce107 - [libcxx] [test] Use `shlex.quote()` to fix Python 3.13 compatibility (#93376)

via libcxx-commits libcxx-commits at lists.llvm.org
Mon May 27 10:27:00 PDT 2024


Author: Michał Górny
Date: 2024-05-27T13:26:56-04:00
New Revision: d3ce1078186389ce39505f06c2a0100dce9187a5

URL: https://github.com/llvm/llvm-project/commit/d3ce1078186389ce39505f06c2a0100dce9187a5
DIFF: https://github.com/llvm/llvm-project/commit/d3ce1078186389ce39505f06c2a0100dce9187a5.diff

LOG: [libcxx] [test] Use `shlex.quote()` to fix Python 3.13 compatibility (#93376)

Replace the use of `pipes.quote()` with `shlex.quote()` to fix
compatibility with Python 3.13. The former was always an undocumented
alias to the latter, and the `pipes` module was removed completely in
Python 3.13.

Fixes #93375

Added: 
    

Modified: 
    libcxx/test/libcxx/lit.local.cfg
    libcxx/utils/libcxx/test/dsl.py

Removed: 
    


################################################################################
diff  --git a/libcxx/test/libcxx/lit.local.cfg b/libcxx/test/libcxx/lit.local.cfg
index 147367323d4a6..4467d8070cc70 100644
--- a/libcxx/test/libcxx/lit.local.cfg
+++ b/libcxx/test/libcxx/lit.local.cfg
@@ -1,4 +1,5 @@
 # The tests in this directory need to run Python
-import pipes, sys
+import shlex
+import sys
 
-config.substitutions.append(("%{python}", pipes.quote(sys.executable)))
+config.substitutions.append(("%{python}", shlex.quote(sys.executable)))

diff  --git a/libcxx/utils/libcxx/test/dsl.py b/libcxx/utils/libcxx/test/dsl.py
index 387862ae6f496..7ac66d449b1cf 100644
--- a/libcxx/utils/libcxx/test/dsl.py
+++ b/libcxx/utils/libcxx/test/dsl.py
@@ -8,8 +8,8 @@
 
 import os
 import pickle
-import pipes
 import platform
+import shlex
 import shutil
 import tempfile
 
@@ -290,7 +290,7 @@ def hasAnyLocale(config, locales):
       }
     #endif
   """
-    return programSucceeds(config, program, args=[pipes.quote(l) for l in locales])
+    return programSucceeds(config, program, args=[shlex.quote(l) for l in locales])
 
 
 @_memoizeExpensiveOperation(lambda c, flags="": (c.substitutions, c.environment, flags))


        


More information about the libcxx-commits mailing list