Skip to content

Commit

Permalink
Replace pipes.quote with shlex.quote.
Browse files Browse the repository at this point in the history
The pipes module has been removed in Python 3.13.

(cherry picked from commit 52d898d8bb6db8728e371d94fc5f87235f1ac202)
  • Loading branch information
woess authored and jerboaa committed Dec 3, 2024
1 parent 981e384 commit 8353bb3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions substratevm/mx.substratevm/mx_substratevm.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
from glob import glob
from contextlib import contextmanager
from os.path import join, exists, dirname
import pipes
import shlex
from argparse import ArgumentParser
import fnmatch
import collections
Expand Down Expand Up @@ -585,7 +585,7 @@ def dummy_harness(test_deps, vm_launcher, vm_args):
unittest_image = native_image(['-ea', '-esa'] + build_args + extra_image_args + [macro_junit + '=' + unittest_file] + svm_experimental_options(['-H:Path=' + junit_test_dir]), env=custom_env)
image_pattern_replacement = unittest_image + ".exe" if mx.is_windows() else unittest_image
run_args = [arg.replace('${unittest.image}', image_pattern_replacement) for arg in run_args]
mx.log('Running: ' + ' '.join(map(pipes.quote, [unittest_image] + run_args)))
mx.log('Running: ' + ' '.join(map(shlex.quote, [unittest_image] + run_args)))
mx.run([unittest_image] + run_args)
finally:
if not preserve_image:
Expand Down
6 changes: 3 additions & 3 deletions sulong/mx.sulong/mx_sulong.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
#
# All rights reserved.
#
Expand Down Expand Up @@ -29,7 +29,7 @@
#
import sys
import os
import pipes
import shlex
import tempfile
from os.path import join
import shutil
Expand Down Expand Up @@ -166,7 +166,7 @@ def get_jacoco_setting():
def _subst_get_jvm_args(dep):
java = mx.get_jdk().java
main_class = mx.distribution(dep).mainClass
jvm_args = [pipes.quote(arg) for arg in mx.get_runtime_jvm_args([dep])]
jvm_args = [shlex.quote(arg) for arg in mx.get_runtime_jvm_args([dep])]
cmd = [java] + jvm_args + [main_class]
return " ".join(cmd)

Expand Down
6 changes: 3 additions & 3 deletions sulong/mx.sulong/mx_sulong_suite_constituents.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
#
# All rights reserved.
#
Expand Down Expand Up @@ -32,7 +32,7 @@

import abc
import fnmatch
import pipes
import shlex

import mx
import mx_cmake
Expand Down Expand Up @@ -418,7 +418,7 @@ def clean(self, forBuild=False):
def contents(self, tool, exe):
# platform support
all_params = '%*' if mx.is_windows() else '"$@"'
_quote = _quote_windows if mx.is_windows() else pipes.quote
_quote = _quote_windows if mx.is_windows() else shlex.quote
# build command line
java = mx.get_jdk().java
classpath_deps = [dep for dep in self.subject.buildDependencies if isinstance(dep, mx.ClasspathDependency)]
Expand Down

0 comments on commit 8353bb3

Please sign in to comment.