1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
Description: Patch out use of dead Python3 libraries pipes and cgi
--- a/llvm-project/clang/utils/creduce-clang-crash.py
+++ b/llvm-project/clang/utils/creduce-clang-crash.py
@@ -15,7 +15,6 @@
import stat
import sys
import subprocess
-import pipes
import shlex
import tempfile
import shutil
@@ -61,7 +60,7 @@
def quote_cmd(cmd):
- return " ".join(pipes.quote(arg) for arg in cmd)
+ return " ".join(shlex.quote(arg) for arg in cmd)
def write_to_script(text, filename):
@@ -220,7 +219,7 @@
)
for msg in self.expected_output:
- output += "grep -F %s t.log || exit 1\n" % pipes.quote(msg)
+ output += "grep -F %s t.log || exit 1\n" % shlex.quote(msg)
write_to_script(output, self.testfile)
self.check_interestingness()
--- a/llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py
+++ b/llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-import glob, os, pipes, sys, subprocess
+import glob, os, shlex, sys, subprocess
device_id = os.environ.get("SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER")
@@ -50,7 +50,7 @@
rm_args.append(arg)
else:
# FIXME(dliew): pipes.quote() is deprecated
- rm_args.append(pipes.quote(arg))
+ rm_args.append(shlex.quote(arg))
rm_cmd_line = ["/bin/rm"] + rm_args
rm_cmd_line_str = " ".join(rm_cmd_line)
# We use `shell=True` so that any wildcard globs get expanded by the shell.
--- a/llvm-project/libcxx/utils/libcxx/test/dsl.py
+++ b/llvm-project/libcxx/utils/libcxx/test/dsl.py
@@ -8,7 +8,7 @@
import os
import pickle
-import pipes
+import shlex
import platform
import re
import shutil
@@ -281,7 +281,7 @@
}
#endif
"""
- return programSucceeds(config, program, args=[pipes.quote(l) for l in locales])
+ return programSucceeds(config, program, args=[shlex.quote(l) for l in locales])
@_memoizeExpensiveOperation(lambda c, flags="": (c.substitutions, c.environment, flags))
--- a/llvm-project/libcxx/utils/libcxx/test/format.py
+++ b/llvm-project/libcxx/utils/libcxx/test/format.py
@@ -11,7 +11,6 @@
import lit
import lit.formats
import os
-import pipes
import re
import shutil
--- a/swift/utils/protocol_graph.py
+++ b/swift/utils/protocol_graph.py
@@ -23,7 +23,7 @@
#
# ===---------------------------------------------------------------------===//
-import cgi
+import html
import os
import re
import sys
@@ -62,7 +62,7 @@
def body_lines(body_text):
return [
- cgi.escape(b.group(0)) for b in
+ html.escape(b.group(0)) for b in
re.finditer(
r'(typealias\s*' + identifier +
r'(\s*[:,]\s*' + identifier + ')?|' + operator + '.*)',
@@ -92,7 +92,7 @@
def parse_generic_operator(m):
generic_params = m.group(5)
- generic_operator = cgi.escape(m.group(0).strip())
+ generic_operator = html.escape(m.group(0).strip())
function_param_start = m.end(5) - m.start(0)
function_params = generic_operator[function_param_start:]
for m2 in re.finditer(
|
