Merge from 3.2

3484c09c · Amaury Forgeot d'Arc · bbe7b0ad · 3e961a5f · 3484c09c
Commit 3484c09c authored Oct 05, 2011 by Amaury Forgeot d'Arc
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Lib/test/test_sys_settrace.py Lib/test/test_sys_settrace.py +2 -2

No files found.
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -283,11 +283,11 @@ class TraceTestCase(unittest.TestCase):
        self.compare_events(func.__code__.co_firstlineno,
                            tracer.events, func.events)

-    def set_and_retrieve_none(self):
+    def test_set_and_retrieve_none(self):
        sys.settrace(None)
        assert sys.gettrace() is None

-    def set_and_retrieve_func(self):
+    def test_set_and_retrieve_func(self):
        def fn(*args):
            pass