Merge from 3.2

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

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,