Merge from 3.2

2012-04-19 22:22:37 +10:00 · 2012-04-19 22:22:37 +10:00 · e27b3608ef
parent dea6c21a9c 10ac77d2d8
commit e27b3608ef
3 changed files with 5 additions and 1 deletions
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@ -242,7 +242,7 @@ class CmdLineTest(unittest.TestCase):
                script_name = _make_test_script(pkg_dir, 'script')
                rc, out, err = assert_python_ok('-m', 'test_pkg.script')
                if verbose > 1:
-                    print(data)
+                    print(out)
                expected = "init_argv0==%r" % '-m'
                self.assertIn(expected.encode('utf-8'), out)
                self._check_output(script_name, rc, out,
--- a/Misc/ACKS
+++ b/Misc/ACKS
@ -1123,6 +1123,7 @@ Robert Xiao
 Florent Xicluna
 Hirokazu Yamamoto
 Ka-Ping Yee
+Jason Yeo
 Bob Yodlowski
 Danny Yoo
 George Yoshida
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -121,6 +121,9 @@ Library
 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
  a test failure in test_ssl.