Merged revisions 83140-83141 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83140 | alexander.belopolsky | 2010-07-25 11:02:55 -0400 (Sun, 25 Jul 2010) | 5 lines

  Issue #9315: Renamed test_trace to test_sys_settrace and
  test_profilehooks to test_sys_setprofile so that test_trace can be
  used for testing the trace module and for naming consistency.
........
  r83141 | alexander.belopolsky | 2010-07-25 11:05:42 -0400 (Sun, 25 Jul 2010) | 1 line

  Corrected comments on where settrace and setprofile are tested.
........

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 24f17fb4ac86489dd8665321aee43bc8ff6e2127..398243a7733e71999ac87e0ace2df02e74903317 100644 (file)
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -164,8 +164,8 @@ class SysModuleTest(unittest.TestCase):
         # can't check more than the type, as the user might have changed it
         self.assertTrue(isinstance(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 99%
rename from Lib/test/test_profilehooks.py
rename to Lib/test/test_sys_setprofile.py
index 296c997c53ee9702f5ad1d707a3c37feb3ad490d..54267a07e92640960647dc3219f4acf93d96b7a9 100644 (file)
--- a/Lib/test/test_profilehooks.py
+++ b/Lib/test/test_sys_setprofile.py
@@ -12,7 +12,7 @@ class TestGetProfile(unittest.TestCase):
         sys.setprofile(None)
 
     def test_empty(self):
-        assert sys.getprofile() == None
+        assert sys.getprofile() is None
 
     def test_setget(self):
         def fn(*args):

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