4 Commits

Author	SHA1	Message	Date
Benjamin Peterson	6913cb0373	Merged revisions 85589-85591 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85589 | benjamin.peterson | 2010-10-16 20:25:19 -0500 (Sat, 16 Oct 2010) | 1 line remove rather pointless test ........ r85590 | benjamin.peterson | 2010-10-16 20:29:11 -0500 (Sat, 16 Oct 2010) | 1 line disable the garbage collector while collecting traces, so that __del__s don't get caught ........ r85591 | benjamin.peterson | 2010-10-16 20:30:26 -0500 (Sat, 16 Oct 2010) | 1 line use assertion methods ........	2010-10-17 01:36:15 +00:00
Alexander Belopolsky	9d12ceb636	Redo r83142 merge manually. QOTD: svnmerge isn't really your best friend	2010-07-28 14:33:17 +00:00
Alexander Belopolsky	9c3597d4bb	Reverted r83142: bad svnmerge	2010-07-28 14:26:06 +00:00
Alexander Belopolsky	137e0b126d	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. ........	2010-07-25 15:07:36 +00:00