diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-10-12 12:04:32 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-10-12 12:04:32 -0400 |
| commit | 143d034ecd110f8543eba4ad76dfb6085cdaeb3d (patch) | |
| tree | 9ddcfc6fe0d0cf8ce8558f88969bf1f9e98c1d25 /Lib/test | |
| parent | c3de6d63cd20cd26a288999d454124cb72eb57fe (diff) | |
| parent | 7a9953edfbbd51dbda60ab31c0e5db5eea968b53 (diff) | |
| download | cpython-git-143d034ecd110f8543eba4ad76dfb6085cdaeb3d.tar.gz | |
merge 3.2
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_runpy.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_timeit.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py index 8b443f6b85..fefefc4285 100644 --- a/Lib/test/test_runpy.py +++ b/Lib/test/test_runpy.py @@ -565,10 +565,10 @@ class RunPathTestCase(unittest.TestCase, CodeExecutionMixin): with open(filename, 'w', encoding='latin1') as f: f.write(""" #coding:latin1 -"non-ASCII: h\xe9" +s = "non-ASCII: h\xe9" """) result = run_path(filename) - self.assertEqual(result['__doc__'], "non-ASCII: h\xe9") + self.assertEqual(result['s'], "non-ASCII: h\xe9") def test_main(): diff --git a/Lib/test/test_timeit.py b/Lib/test/test_timeit.py index eb3b1a156b..625fb8da90 100644 --- a/Lib/test/test_timeit.py +++ b/Lib/test/test_timeit.py @@ -250,6 +250,7 @@ class TestTimeit(unittest.TestCase): s = self.run_main(seconds_per_increment=60.0, switches=['-r-5']) self.assertEqual(s, "10 loops, best of 1: 60 sec per loop\n") + @unittest.skipIf(sys.flags.optimize >= 2, "need __doc__") def test_main_help(self): s = self.run_main(switches=['-h']) # Note: It's not clear that the trailing space was intended as part of |