[Python-checkins] cpython (merge 3.2 -> default): Merge from 3.2

[amaury.forgeotdarc]

http://hg.python.org/cpython/rev/e9cf6e6d6b1f
changeset:   72709:e9cf6e6d6b1f
parent:      72706:3a5a0943b201
parent:      72708:a0393cbe4872
user:        Amaury Forgeot d'Arc <amauryfa at gmail.com>
date:        Wed Oct 05 22:37:06 2011 +0200
summary:
  Merge from 3.2

files:
  Lib/test/test_sys_settrace.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -283,11 +283,11 @@
         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
 

-- 
Repository URL: http://hg.python.org/cpython