[Checkins] SVN: z3c.batching/trunk/src/z3c/batching/ pep8
Jean-Francois Roche
jfroche at jfroche.be
Fri Aug 20 09:09:48 EDT 2010
Log message for revision 115831:
pep8
Changed:
U z3c.batching/trunk/src/z3c/batching/batch.py
U z3c.batching/trunk/src/z3c/batching/interfaces.py
U z3c.batching/trunk/src/z3c/batching/tests.py
-=-
Modified: z3c.batching/trunk/src/z3c/batching/batch.py
===================================================================
--- z3c.batching/trunk/src/z3c/batching/batch.py 2010-08-20 13:07:05 UTC (rev 115830)
+++ z3c.batching/trunk/src/z3c/batching/batch.py 2010-08-20 13:09:48 UTC (rev 115831)
@@ -26,7 +26,6 @@
class Batch(object):
"""Batch implementation. See IBatch"""
-
zope.interface.implements(interfaces.IBatch)
start = FieldProperty(interfaces.IBatch['start'])
@@ -112,11 +111,11 @@
"""See zope.interface.common.sequence.IMinimalSequence"""
if key >= self._trueSize:
raise IndexError('batch index out of range')
- return self.sequence[self.start+key]
+ return self.sequence[self.start + key]
def __iter__(self):
"""See zope.interface.common.sequence.IMinimalSequence"""
- return iter(self.sequence[self.start: self.end+1])
+ return iter(self.sequence[self.start: self.end + 1])
def __len__(self):
"""See zope.interface.common.sequence.IFiniteSequence"""
@@ -154,14 +153,12 @@
"""A sequence object representing all the batches.
Used by a Batch.
"""
-
zope.interface.implements(IFiniteSequence)
-
+
def __init__(self, batch):
self.size = batch.size
self.total = batch.total
self.sequence = batch.sequence
-
self._batches = {batch.index: batch}
def __len__(self):
@@ -173,7 +170,7 @@
key = self.total + key
batch = Batch(
- self.sequence, key*self.size, self.size, self)
+ self.sequence, key * self.size, self.size, self)
self._batches[batch.index] = batch
try:
@@ -221,7 +218,7 @@
[0, 1, 2, 3, 4, 5, None, 99]
[0, None, 2, 3, 4, 5, 6, None, 99]
[0, None, 3, 4, 5, 6, 7, None, 99]
-
+
>>> for i in range(93, 99):
... f_n_l(batches, i, 2, 2)
[0, None, 91, 92, 93, 94, 95, None, 99]
@@ -306,4 +303,3 @@
if currentBatchIdx < lastIdx:
sublist.append(lastBatch)
return sublist
-
Modified: z3c.batching/trunk/src/z3c/batching/interfaces.py
===================================================================
--- z3c.batching/trunk/src/z3c/batching/interfaces.py 2010-08-20 13:07:05 UTC (rev 115830)
+++ z3c.batching/trunk/src/z3c/batching/interfaces.py 2010-08-20 13:09:48 UTC (rev 115831)
@@ -19,6 +19,7 @@
from zope.interface.common import sequence
import zope.schema
+
class IBatch(sequence.IFiniteSequence):
"""A Batch represents a sub-list of the full sequence.
Modified: z3c.batching/trunk/src/z3c/batching/tests.py
===================================================================
--- z3c.batching/trunk/src/z3c/batching/tests.py 2010-08-20 13:07:05 UTC (rev 115830)
+++ z3c.batching/trunk/src/z3c/batching/tests.py 2010-08-20 13:09:48 UTC (rev 115831)
@@ -17,17 +17,16 @@
"""
__docformat__ = "reStructuredText"
-import doctest, unittest
+import doctest
+import unittest
from z3c.batching import batch
-def test_suite():
+def test_suite():
return unittest.TestSuite((
doctest.DocFileSuite(
'README.txt',
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS
- ),
+ optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS),
doctest.DocTestSuite(batch,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS
- )
+ optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS),
))
More information about the checkins
mailing list