From e91dc77fe63ff15811f57868b366858869a9e391 Mon Sep 17 00:00:00 2001 From: Mark Feit Date: Tue, 9 Jan 2024 19:11:07 +0000 Subject: [PATCH] Replace use of deprecated pipes with shlex for quoting. #1370 --- pscheduler-core/pscheduler-core/result | 4 ++-- pscheduler-core/pscheduler-core/schedule | 4 ++-- pscheduler-core/pscheduler-core/task | 4 ++-- pscheduler-core/pscheduler-core/troubleshoot | 5 ++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pscheduler-core/pscheduler-core/result b/pscheduler-core/pscheduler-core/result index a66be2e037..cbd51d2433 100755 --- a/pscheduler-core/pscheduler-core/result +++ b/pscheduler-core/pscheduler-core/result @@ -6,8 +6,8 @@ import datetime import optparse import os -import pipes import pscheduler +import shlex import sys @@ -239,7 +239,7 @@ def dump_run(run_json, exit_on_error=False, print_run_url=False): print() print(pscheduler.prefixed_wrap( - "", " ".join([ pipes.quote(arg) for arg in task_cli ]), + "", " ".join([ shlex.quote(arg) for arg in task_cli ]), indent=2)) print() diff --git a/pscheduler-core/pscheduler-core/schedule b/pscheduler-core/pscheduler-core/schedule index 60453d09bc..c4d7fabf1c 100755 --- a/pscheduler-core/pscheduler-core/schedule +++ b/pscheduler-core/pscheduler-core/schedule @@ -9,9 +9,9 @@ import datetime import optparse import os -import pipes import pscheduler import pytz +import shlex import sys import urllib @@ -291,7 +291,7 @@ for run in schedule: task_cli = [ test ] - task_cli.extend([ pipes.quote(arg) for arg in run["cli"] ]) + task_cli.extend([ shlex.quote(arg) for arg in run["cli"] ]) if not first: print() diff --git a/pscheduler-core/pscheduler-core/task b/pscheduler-core/pscheduler-core/task index 2fca12435a..b591dfeb78 100755 --- a/pscheduler-core/pscheduler-core/task +++ b/pscheduler-core/pscheduler-core/task @@ -6,7 +6,7 @@ import datetime import optparse import os -import pipes +import shlex import pscheduler import subprocess import sys @@ -802,6 +802,6 @@ if options.output is not None: # TODO: Pass --verbose once watch supports that. watch_args.append(task_url) -watch_args = " ".join([ pipes.quote(arg) for arg in watch_args ]) +watch_args = " ".join([ shlex.quote(arg) for arg in watch_args ]) log.debug("Handing off: %s", watch_args) os.execl("/bin/sh", "/bin/sh", "-c", watch_args) diff --git a/pscheduler-core/pscheduler-core/troubleshoot b/pscheduler-core/pscheduler-core/troubleshoot index ffb6abf0e9..c3a093d0f9 100755 --- a/pscheduler-core/pscheduler-core/troubleshoot +++ b/pscheduler-core/pscheduler-core/troubleshoot @@ -14,8 +14,8 @@ are working. import optparse import os -import pipes import re +import shlex import socket import sys import time @@ -30,7 +30,6 @@ pscheduler.set_graceful_exit() # class VerbatimParser(optparse.OptionParser): - def format_epilog(self, formatter): return self.epilog opt_parser = VerbatimParser( @@ -155,7 +154,7 @@ def failed_diags(run, why="Task failed to run properly."): print() result_args = ["pscheduler", "result", "--diags", "--archivings", run] os.execl("/bin/sh", "/bin/sh", "-c", - " ".join([pipes.quote(arg) for arg in result_args])) + " ".join([shlex.quote(arg) for arg in result_args]))