Skip to content

C
cpython
Commit e27b3608 authored by Nick Coghlan's avatar Nick Coghlan
Browse files
Options

Merge from 3.2

parents dea6c21a 10ac77d2
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
Lib/test/test_cmd_line_script.py
View file @ e27b3608
...@@ -242,7 +242,7 @@ class CmdLineTest(unittest.TestCase): ...@@ -242,7 +242,7 @@ class CmdLineTest(unittest.TestCase):
script_name = _make_test_script(pkg_dir, 'script') script_name = _make_test_script(pkg_dir, 'script')
rc, out, err = assert_python_ok('-m', 'test_pkg.script') rc, out, err = assert_python_ok('-m', 'test_pkg.script')
if verbose > 1: if verbose > 1:
print(data) print(out)
expected = "init_argv0==%r" % '-m' expected = "init_argv0==%r" % '-m'
self.assertIn(expected.encode('utf-8'), out) self.assertIn(expected.encode('utf-8'), out)
self._check_output(script_name, rc, out, self._check_output(script_name, rc, out,
......
Misc/ACKS
View file @ e27b3608
...@@ -1123,6 +1123,7 @@ Robert Xiao ...@@ -1123,6 +1123,7 @@ Robert Xiao
Florent Xicluna Florent Xicluna
Hirokazu Yamamoto Hirokazu Yamamoto
Ka-Ping Yee Ka-Ping Yee
Jason Yeo
Bob Yodlowski Bob Yodlowski
Danny Yoo Danny Yoo
George Yoshida George Yoshida
......
Misc/NEWS
View file @ e27b3608
...@@ -121,6 +121,9 @@ Library ...@@ -121,6 +121,9 @@ Library
Tests Tests
----- -----
- Issue #14032: Fix incorrect variable name in test_cmd_line_script debugging
message (Patch by Jason Yeo)
- Issue #14589: Update certificate chain for sha256.tbs-internet.com, fixing - Issue #14589: Update certificate chain for sha256.tbs-internet.com, fixing
a test failure in test_ssl. a test failure in test_ssl.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7