Merge pull request #3869 from titusz/fix/shlex

Fix shlex.quote() use in linter on Windows
This commit is contained in:
paul-gauthier 2025-05-07 16:23:53 -07:00 committed by GitHub
commit cbaaf96324
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 24 additions and 8 deletions

View file

@ -4,7 +4,7 @@ import subprocess
import sys
import traceback
import warnings
import shlex
import oslex
from dataclasses import dataclass
from pathlib import Path
@ -45,7 +45,7 @@ class Linter:
return fname
def run_cmd(self, cmd, rel_fname, code):
cmd += " " + shlex.quote(rel_fname)
cmd += " " + oslex.quote(rel_fname)
returncode = 0
stdout = ""

View file

@ -1,7 +1,7 @@
import itertools
import os
import platform
import shlex
import oslex
import subprocess
import sys
import tempfile
@ -384,10 +384,7 @@ def printable_shell_command(cmd_list):
Returns:
str: Shell-escaped command string.
"""
if platform.system() == "Windows":
return subprocess.list2cmdline(cmd_list)
else:
return shlex.join(cmd_list)
return oslex.join(cmd_list)
def main():