From e79a9e239ff6c1a80d71e05d14ca6997c2c31882 Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Sat, 4 Jan 2025 09:12:52 +0100 Subject: [PATCH] python3.13-quote Gbp-Pq: Name python3.13-quote.diff --- clang/utils/creduce-clang-crash.py | 5 ++--- .../test/sanitizer_common/ios_commands/iossim_run.py | 10 ++++++---- libcxx/utils/libcxx/test/dsl.py | 4 ++-- libcxx/utils/libcxx/test/format.py | 1 - 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/clang/utils/creduce-clang-crash.py b/clang/utils/creduce-clang-crash.py index 27361bb885..daa743bef0 100755 --- a/clang/utils/creduce-clang-crash.py +++ b/clang/utils/creduce-clang-crash.py @@ -15,7 +15,6 @@ import shutil import stat import sys import subprocess -import pipes import shlex import tempfile import shutil @@ -61,7 +60,7 @@ def check_cmd(cmd_name, cmd_dir, cmd_path=None): def quote_cmd(cmd): - return " ".join(pipes.quote(arg) for arg in cmd) + return " ".join(shlex.quote(arg) for arg in cmd) def write_to_script(text, filename): @@ -220,7 +219,7 @@ fi ) for msg in self.expected_output: - output += "grep -F %s t.log || exit 1\n" % pipes.quote(msg) + output += "grep -F %s t.log || exit 1\n" % shlex.quote(msg) write_to_script(output, self.testfile) self.check_interestingness() diff --git a/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py b/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py index 5e977ea5ed..9729668798 100755 --- a/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py +++ b/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py @@ -1,7 +1,10 @@ #!/usr/bin/env python3 -import glob, os, pipes, sys, subprocess - +import glob, os, sys, subprocess +try: + from pipes import quote +except ImportError: + from shlex import quote device_id = os.environ.get("SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER") iossim_run_verbose = os.environ.get("SANITIZER_IOSSIM_RUN_VERBOSE") @@ -49,8 +52,7 @@ if prog == "rm": # Don't quote glob pattern rm_args.append(arg) else: - # FIXME(dliew): pipes.quote() is deprecated - rm_args.append(pipes.quote(arg)) + rm_args.append(quote(arg)) rm_cmd_line = ["/bin/rm"] + rm_args rm_cmd_line_str = " ".join(rm_cmd_line) # We use `shell=True` so that any wildcard globs get expanded by the shell. diff --git a/libcxx/utils/libcxx/test/dsl.py b/libcxx/utils/libcxx/test/dsl.py index 77a709655c..40c4da0c21 100644 --- a/libcxx/utils/libcxx/test/dsl.py +++ b/libcxx/utils/libcxx/test/dsl.py @@ -8,9 +8,9 @@ import os import pickle -import pipes import platform import re +import shlex import shutil import subprocess import tempfile @@ -281,7 +281,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)) diff --git a/libcxx/utils/libcxx/test/format.py b/libcxx/utils/libcxx/test/format.py index da8605e066..0baf63ac15 100644 --- a/libcxx/utils/libcxx/test/format.py +++ b/libcxx/utils/libcxx/test/format.py @@ -11,7 +11,6 @@ import io import lit import lit.formats import os -import pipes import re import shutil -- 2.30.2