From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Wed, 28 Jul 2010 14:33:17 +0000 (+0000)
Subject: Redo r83142 merge manually. QOTD: svnmerge isn't really your best friend
X-Git-Tag: v2.7.1rc1~543
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d12ceb63616b3c334f9eb64312aa7af9ad328ff;p=python

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 b17827cd66..53cdcb2f6a 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
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