Merged revisions 80993 via svnmerge from

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

................
  r80993 | benjamin.peterson | 2010-05-08 11:51:16 -0500 (Sat, 08 May 2010) | 9 lines

  Merged revisions 80991 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80991 | benjamin.peterson | 2010-05-08 11:44:52 -0500 (Sat, 08 May 2010) | 1 line

    run and fix enumerate start test cases #8636
  ........
................

diff --git a/Lib/test/test_enumerate.py b/Lib/test/test_enumerate.py
index cdb9e7e411e407af15b4a92b6ebfdabc79de3c07..315069c48e7bbb5f9b4fe41c0a4990fb5d204665 100644 (file)
--- a/Lib/test/test_enumerate.py
+++ b/Lib/test/test_enumerate.py
@@ -199,26 +199,31 @@ class TestReversed(unittest.TestCase):
         self.assertEqual(rc, sys.getrefcount(r))
 
 
-class TestStart(EnumerateTestCase):
+class EnumerateStartTestCase(EnumerateTestCase):
 
-    enum = lambda i: enumerate(i, start=11)
-    seq, res = 'abc', [(1, 'a'), (2, 'b'), (3, 'c')]
+    def test_basicfunction(self):
+        e = self.enum(self.seq)
+        self.assertEqual(iter(e), e)
+        self.assertEqual(list(self.enum(self.seq)), self.res)
+
+
+class TestStart(EnumerateStartTestCase):
+
+    enum = lambda self, i: enumerate(i, start=11)
+    seq, res = 'abc', [(11, 'a'), (12, 'b'), (13, 'c')]
 
 
-class TestLongStart(EnumerateTestCase):
+class TestLongStart(EnumerateStartTestCase):
 
-    enum = lambda i: enumerate(i, start=sys.maxsize+1)
+    enum = lambda self, i: enumerate(i, start=sys.maxsize+1)
     seq, res = 'abc', [(sys.maxsize+1,'a'), (sys.maxsize+2,'b'),
                        (sys.maxsize+3,'c')]
 
 
 def test_main(verbose=None):
-    testclasses = (EnumerateTestCase, SubclassTestCase, TestEmpty, TestBig,
-                   TestReversed)
-    support.run_unittest(*testclasses)
+    support.run_unittest(__name__)
 
     # verify reference counting
-    import sys
     if verbose and hasattr(sys, "gettotalrefcount"):
         counts = [None] * 5
         for i in range(len(counts)):