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 b17827c..53cdcb2 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -205,8 +205,8 @@
# 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)