Redo r83142 merge manually. QOTD: svnmerge isn't really your best friend

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index b17827cd66d3984da5b9d3b881a8e0c947b6d589..53cdcb2f6a516f06b05f4a0abd9d78bd7c51c2fc 100644 (file)
--- 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
similarity index 100%
rename from Lib/test/test_profilehooks.py
rename to Lib/test/test_sys_setprofile.py

diff --git a/Lib/test/test_trace.py b/Lib/test/test_sys_settrace.py
similarity index 100%
rename from Lib/test/test_trace.py
rename to Lib/test/test_sys_settrace.py