Use shlex instead of pipes

Importing pipes gets a DeprecationWarning. shlex.quote is equivalent to
pipes.quote. Use that instead.

Bug: 1522874
Change-Id: I18b8598f2e961d58ba71d886921bda9d9ad956ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5243707
Reviewed-by: Joanna Wang <jojwang@chromium.org>
Auto-Submit: Gavin Mak <gavinmak@google.com>
Commit-Queue: Joanna Wang <jojwang@chromium.org>
changes/07/5243707/2
Gavin Mak 1 year ago committed by LUCI CQ
parent 1b57e24a4e
commit b808b1bcdd

@ -20,7 +20,7 @@ These parameters will be passed through to the config's main method.
import json import json
import argparse import argparse
import os import os
import pipes import shlex
import subprocess import subprocess
import sys import sys
@ -57,7 +57,7 @@ class Checkout(object):
pass pass
def run(self, cmd, return_stdout=False, **kwargs): def run(self, cmd, return_stdout=False, **kwargs):
print('Running: %s' % (' '.join(pipes.quote(x) for x in cmd))) print('Running: %s' % (' '.join(shlex.quote(x) for x in cmd)))
if self.options.dry_run: if self.options.dry_run:
return '' return ''
if return_stdout: if return_stdout:
@ -98,7 +98,7 @@ class GclientCheckout(Checkout):
class GitCheckout(Checkout): class GitCheckout(Checkout):
def run_git(self, *cmd, **kwargs): def run_git(self, *cmd, **kwargs):
print('Running: git %s' % (' '.join(pipes.quote(x) for x in cmd))) print('Running: git %s' % (' '.join(shlex.quote(x) for x in cmd)))
if self.options.dry_run: if self.options.dry_run:
return '' return ''
return git_common.run(*cmd, **kwargs) return git_common.run(*cmd, **kwargs)

@ -13,10 +13,10 @@ import io
import logging import logging
import operator import operator
import os import os
import pipes
import platform import platform
import queue import queue
import re import re
import shlex
import stat import stat
import subprocess import subprocess
import sys import sys
@ -369,7 +369,7 @@ def safe_makedirs(tree):
def CommandToStr(args): def CommandToStr(args):
"""Converts an arg list into a shell escaped string.""" """Converts an arg list into a shell escaped string."""
return ' '.join(pipes.quote(arg) for arg in args) return ' '.join(shlex.quote(arg) for arg in args)
class Wrapper(object): class Wrapper(object):

Loading…
Cancel
Save