Skip to content

Commit

Permalink
[GR-58992] Avoid using deprecated pipes module (removed in Python 3.13).
Browse files Browse the repository at this point in the history
PullRequest: graal/19003
  • Loading branch information
woess committed Oct 15, 2024
2 parents 89a0dcb + 1b0be9e commit 23258f0
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions sdk/mx.sdk/mx_sdk_shaded.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,8 @@ def glob_match(path, pattern):
"""
assert isinstance(path, PurePath), path
if sys.version_info[:2] >= (3, 13):
# Since Python 3.13, PurePath.match already supports '**'.
return path.match(pattern)
# Python 3.13+: PurePath.full_match already supports '**'.
return path.full_match(pattern)

pathType = type(path)
patternParts = pathType(pattern).parts
Expand Down
4 changes: 2 additions & 2 deletions substratevm/mx.substratevm/mx_substratevm.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from contextlib import contextmanager
from itertools import islice
from os.path import join, exists, dirname
import pipes
import shlex
from argparse import ArgumentParser
import fnmatch
import collections
Expand Down Expand Up @@ -684,7 +684,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)))

if not test_classes_per_run:
# Run all tests in one go. The default behavior.
Expand Down
4 changes: 2 additions & 2 deletions sulong/mx.sulong/mx_sulong.py
Original file line number Diff line number Diff line change
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
4 changes: 2 additions & 2 deletions sulong/mx.sulong/mx_sulong_suite_constituents.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

import abc
import fnmatch
import pipes
import shlex

import mx
import mx_cmake
Expand Down Expand Up @@ -419,7 +419,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 23258f0

Please sign in to comment.