Skip to content

Commit b1aa11b

Browse files
committed
Uncomment some things that were dependent on proper subprocess
1 parent 791d171 commit b1aa11b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Lib/platform.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,9 @@ def _syscmd_ver(system='', release='', version='',
281281
for cmd in ('ver', 'command /c ver', 'cmd /c ver'):
282282
try:
283283
info = subprocess.check_output(cmd,
284-
stderr=subprocess.DEVNULL,)
285-
# XXX RustPython TODO: more Popen args
286-
# text=True,
287-
# shell=True)
284+
stderr=subprocess.DEVNULL,
285+
text=True,
286+
shell=True)
288287
except (OSError, subprocess.CalledProcessError) as why:
289288
#print('Command %s failed: %s' % (cmd, why))
290289
continue

Lib/test/support/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2442,7 +2442,8 @@ def strip_python_stderr(stderr):
24422442
This will typically be run on the result of the communicate() method
24432443
of a subprocess.Popen object.
24442444
"""
2445-
stderr = re.sub(br"\[\d+ refs, \d+ blocks\]\r?\n?", b"", stderr).strip()
2445+
# XXX RustPython TODO: bytes regexes
2446+
# stderr = re.sub(br"\[\d+ refs, \d+ blocks\]\r?\n?", b"", stderr).strip()
24462447
return stderr
24472448

24482449
requires_type_collecting = unittest.skipIf(hasattr(sys, 'getcounts'),

Lib/test/test_json/test_tool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from test.support.script_helper import assert_python_ok
88

99

10-
@unittest.skip("TODO: RUSTPYTHON") # Need to fix subprocess to take env
10+
@unittest.skip("TODO: RUSTPYTHON, rustpython -X faulthandler")
1111
class TestTool(unittest.TestCase):
1212
data = """
1313

0 commit comments

Comments
 (0)