[Python-checkins] cpython (merge 3.2 -> default): Merge from 3.2

[nick.coghlan]

http://hg.python.org/cpython/rev/18abb0b338c8
changeset:   76417:18abb0b338c8
parent:      76415:0f837071fd97
parent:      76416:c4c67c2d8ffc
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Thu Apr 19 22:22:37 2012 +1000
summary:
  Merge from 3.2

files:
  Lib/test/test_cmd_line_script.py |  2 +-
  Misc/ACKS                        |  1 +
  Misc/NEWS                        |  3 +++
  3 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -242,7 +242,7 @@
                 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,
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1123,6 +1123,7 @@
 Florent Xicluna
 Hirokazu Yamamoto
 Ka-Ping Yee
+Jason Yeo
 Bob Yodlowski
 Danny Yoo
 George Yoshida
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -121,6 +121,9 @@
 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.
 

-- 
Repository URL: http://hg.python.org/cpython