Batch fixes.

lib/python/ZTUtils/Batch.py

@@ -84,8 +84,8 @@
 ##############################################################################
 __doc__='''Batch class, for iterating over a sequence in batches
 
-$Id: Batch.py,v 1.3 2001/10/02 18:34:30 amos Exp $'''
-__version__='$Revision: 1.3 $'[11:-2]
+$Id: Batch.py,v 1.4 2001/10/02 20:54:49 evan Exp $'''
+__version__='$Revision: 1.4 $'[11:-2]
 
 from ExtensionClass import Base
 
@@ -135,7 +135,7 @@ class Batch(Base):
             if index + self.end < self.first: raise IndexError, index
             return self._sequence[index + self.end]
         
-        if index >= self.size: raise IndexError, index
+        if index >= self.length: raise IndexError, index
         return self._sequence[index+self.first]
 
     def __len__(self):

lib/python/ZTUtils/CHANGES.txt

@@ -11,6 +11,7 @@ ZTUtils changes
         - Orphans defaulted to 3, which was confusing and out of sync
           with DTML-In.
 
+        - Orphan batches were broken.
 
 
 

lib/python/ZTUtils/tests/testBatch.py

@@ -33,11 +33,11 @@ class BatchTests(unittest.TestCase):
             b = Batch(range(bsize), 5, orphan=3)
             assert b.next is None
             assert len(b) == bsize
+            assert b[bsize - 1] == bsize - 1
         b = Batch(range(8), 5)
         assert len(b) == 5
         assert len(b.next) == 3
-        
-        
+
 def test_suite():
     return unittest.makeSuite(BatchTests)