diff options
| author | Michał Górny <mgorny@gentoo.org> | 2024-05-27 19:26:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-27 13:26:56 -0400 |
| commit | d3ce1078186389ce39505f06c2a0100dce9187a5 (patch) | |
| tree | 592082fe1061e3436c02d66938751eef740dde0e | |
| parent | 34388f986af1289492d043b56b6cba17468d1f8d (diff) | |
| download | llvm-d3ce1078186389ce39505f06c2a0100dce9187a5.zip llvm-d3ce1078186389ce39505f06c2a0100dce9187a5.tar.gz llvm-d3ce1078186389ce39505f06c2a0100dce9187a5.tar.bz2 | |
[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
| -rw-r--r-- | libcxx/test/libcxx/lit.local.cfg | 5 | ||||
| -rw-r--r-- | libcxx/utils/libcxx/test/dsl.py | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libcxx/test/libcxx/lit.local.cfg b/libcxx/test/libcxx/lit.local.cfg index 1473673..4467d80 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 387862a..7ac66d4 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)) |