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

[benjamin.peterson]

http://hg.python.org/cpython/rev/5dd75cdd445a
changeset:   70881:5dd75cdd445a
parent:      70879:0d0ca6f95d9d
parent:      70880:9e58a638f028
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Jun 19 17:49:22 2011 -0500
summary:
  merge 3.2

files:
  Lib/test/test_super.py |  14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_super.py b/Lib/test/test_super.py
--- a/Lib/test/test_super.py
+++ b/Lib/test/test_super.py
@@ -44,33 +44,33 @@
 
 class TestSuper(unittest.TestCase):
 
-    def testBasicsWorking(self):
+    def test_basics_working(self):
         self.assertEqual(D().f(), 'ABCD')
 
-    def testClassGetattrWorking(self):
+    def test_class_getattr_working(self):
         self.assertEqual(D.f(D()), 'ABCD')
 
-    def testSubclassNoOverrideWorking(self):
+    def test_subclass_no_override_working(self):
         self.assertEqual(E().f(), 'ABCD')
         self.assertEqual(E.f(E()), 'ABCD')
 
-    def testUnboundMethodTransferWorking(self):
+    def test_unbound_method_transfer_working(self):
         self.assertEqual(F().f(), 'ABCD')
         self.assertEqual(F.f(F()), 'ABCD')
 
-    def testClassMethodsStillWorking(self):
+    def test_class_methods_still_working(self):
         self.assertEqual(A.cm(), (A, 'A'))
         self.assertEqual(A().cm(), (A, 'A'))
         self.assertEqual(G.cm(), (G, 'A'))
         self.assertEqual(G().cm(), (G, 'A'))
 
-    def testSuperInClassMethodsWorking(self):
+    def test_super_in_class_methods_working(self):
         d = D()
         self.assertEqual(d.cm(), (d, (D, (D, (D, 'A'), 'B'), 'C'), 'D'))
         e = E()
         self.assertEqual(e.cm(), (e, (E, (E, (E, 'A'), 'B'), 'C'), 'D'))
 
-    def testSuperWithClosure(self):
+    def test_super_with_closure(self):
         # Issue4360: super() did not work in a function that
         # contains a closure
         class E(A):

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