[test] Remove Python<3.3 workaround without shlex.quote

Python>=3.6 has been the requirement since D93097 (2020).
Remove old workarounds.

Remove unused imports from compiler-rt/test/memprof/lit.cfg.py

Reviewed By: serge-sans-paille

Differential Revision: https://reviews.llvm.org/D150410
This commit is contained in:
Fangrui Song 2023-05-11 23:06:01 -07:00
parent 2394f091df
commit aa6cb0f214
3 changed files with 7 additions and 32 deletions

View File

@ -3,18 +3,10 @@
import os
import platform
import re
import shlex
import lit.formats
# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if
# it's not available.
try:
import shlex
sh_quote = shlex.quote
except:
import pipes
sh_quote = pipes.quote
def get_required_attr(config, attr_name):
attr_value = getattr(config, attr_name, None)
if attr_value == None:
@ -182,7 +174,7 @@ if platform.system() == 'Windows':
# FIXME: De-hardcode this path.
asan_source_dir = os.path.join(
get_required_attr(config, "compiler_rt_src_root"), "lib", "asan")
python_exec = sh_quote(get_required_attr(config, "python_executable"))
python_exec = shlex.quote(get_required_attr(config, "python_executable"))
# Setup path to asan_symbolize.py script.
asan_symbolize = os.path.join(asan_source_dir, "scripts", "asan_symbolize.py")
if not os.path.exists(asan_symbolize):

View File

@ -6,21 +6,13 @@
import os
import platform
import re
import shlex
import subprocess
import json
import lit.formats
import lit.util
# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if
# it's not available.
try:
import shlex
sh_quote = shlex.quote
except:
import pipes
sh_quote = pipes.quote
def find_compiler_libdir():
"""
Returns the path to library resource directory used
@ -730,15 +722,15 @@ if config.host_os == 'Darwin':
config.substitutions.append((
"%get_pid_from_output",
"{} {}/get_pid_from_output.py".format(
sh_quote(config.python_executable),
sh_quote(get_ios_commands_dir())
shlex.quote(config.python_executable),
shlex.quote(get_ios_commands_dir())
))
)
config.substitutions.append(
("%print_crashreport_for_pid",
"{} {}/print_crashreport_for_pid.py".format(
sh_quote(config.python_executable),
sh_quote(get_ios_commands_dir())
shlex.quote(config.python_executable),
shlex.quote(get_ios_commands_dir())
))
)

View File

@ -6,15 +6,6 @@ import re
import lit.formats
# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if
# it's not available.
try:
import shlex
sh_quote = shlex.quote
except:
import pipes
sh_quote = pipes.quote
def get_required_attr(config, attr_name):
attr_value = getattr(config, attr_name, None)
if attr_value == None: