diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-07-28 14:33:17 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-07-28 14:33:17 (GMT) |
| commit | 9d12ceb63616b3c334f9eb64312aa7af9ad328ff (patch) | |
| tree | de566b06e715eb3234722c1324d76e9e59f26e96 /Lib/test | |
| parent | ca23784e42941f7c2880e9307e0115d7fca3ebf2 (diff) | |
| download | cpython-9d12ceb63616b3c334f9eb64312aa7af9ad328ff.zip cpython-9d12ceb63616b3c334f9eb64312aa7af9ad328ff.tar.gz cpython-9d12ceb63616b3c334f9eb64312aa7af9ad328ff.tar.bz2 | |
Redo r83142 merge manually. QOTD: svnmerge isn't really your best friend
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_sys.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_sys_setprofile.py (renamed from Lib/test/test_profilehooks.py) | 0 | ||||
| -rw-r--r-- | Lib/test/test_sys_settrace.py (renamed from Lib/test/test_trace.py) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index b17827c..53cdcb2 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -205,8 +205,8 @@ class SysModuleTest(unittest.TestCase): # can't check more than the type, as the user might have changed it self.assertIsInstance(sys.getdefaultencoding(), str) - # testing sys.settrace() is done in test_trace.py - # testing sys.setprofile() is done in test_profile.py + # testing sys.settrace() is done in test_sys_settrace.py + # testing sys.setprofile() is done in test_sys_setprofile.py def test_setcheckinterval(self): self.assertRaises(TypeError, sys.setcheckinterval) diff --git a/Lib/test/test_profilehooks.py b/Lib/test/test_sys_setprofile.py index 4083d11..4083d11 100644 --- a/Lib/test/test_profilehooks.py +++ b/Lib/test/test_sys_setprofile.py diff --git a/Lib/test/test_trace.py b/Lib/test/test_sys_settrace.py index c04be50..c04be50 100644 --- a/Lib/test/test_trace.py +++ b/Lib/test/test_sys_settrace.py |