mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge from 3.2

Browse source
This commit is contained in:
Nick Coghlan 2012-04-19 22:22:37 +10:00
commit e27b3608ef
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_cmd_line_script.py
View file

@ -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,

1
Misc/ACKS
View file

@ -1123,6 +1123,7 @@ Robert Xiao
Florent Xicluna
Hirokazu Yamamoto
Ka-Ping Yee
Jason Yeo
Bob Yodlowski
Danny Yoo
George Yoshida

3
Misc/NEWS
View file

@ -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.