[Checkins] SVN: z3c.table/branches/lazyvalues2/src/z3c/table/ pyflakes, pep8
Godefroid Chapelle
gotcha at bubblenet.be
Thu Aug 5 05:58:23 EDT 2010
Log message for revision 115491:
pyflakes, pep8
Changed:
U z3c.table/branches/lazyvalues2/src/z3c/table/batch.py
U z3c.table/branches/lazyvalues2/src/z3c/table/column.py
U z3c.table/branches/lazyvalues2/src/z3c/table/header.py
U z3c.table/branches/lazyvalues2/src/z3c/table/interfaces.py
U z3c.table/branches/lazyvalues2/src/z3c/table/table.py
U z3c.table/branches/lazyvalues2/src/z3c/table/tests.py
U z3c.table/branches/lazyvalues2/src/z3c/table/value.py
-=-
Modified: z3c.table/branches/lazyvalues2/src/z3c/table/batch.py
===================================================================
--- z3c.table/branches/lazyvalues2/src/z3c/table/batch.py 2010-08-05 09:43:24 UTC (rev 115490)
+++ z3c.table/branches/lazyvalues2/src/z3c/table/batch.py 2010-08-05 09:58:22 UTC (rev 115491)
@@ -36,20 +36,20 @@
This batch provider offers a batch presentation for a given table. The
batch provides different configuration options which can be overriden in
custom implementations:
-
+
The batch acts like this. If we have more batches than
(prevBatchSize + nextBatchSize + 3) then the advanced batch subset is used.
- Otherwise, we will render all batch links.
+ Otherwise, we will render all batch links.
Note, the additional factor 3 is the placeholder for the first, current and
last item.
Such a batch looks like:
- Renders the link for the first batch, spacers, the amount of links for
- previous batches, the current batch link, spacers, the amount of links for
+ Renders the link for the first batch, spacers, the amount of links for
+ previous batches, the current batch link, spacers, the amount of links for
previous batches and the link for the last batch.
-
- Sample for 1000 items with 100 batches with batchSize of 10 and a
+
+ Sample for 1000 items with 100 batches with batchSize of 10 and a
prevBatchSize of 3 and a nextBatchSize of 3:
For the first item:
@@ -79,15 +79,14 @@
self.batches = table.rows.batches
def renderBatchLink(self, batch, cssClass=None):
- query = '%s=%s&%s=%s' % (self.table.prefix +'-batchStart', batch.start,
- self.table.prefix +'-batchSize', batch.size)
+ query = '%s=%s&%s=%s' % (self.table.prefix + '-batchStart',
+ batch.start, self.table.prefix + '-batchSize', batch.size)
tableURL = absoluteURL(self.table, self.request)
- idx = batch.index +1
+ idx = batch.index + 1
css = ' class="%s"' % cssClass
cssClass = cssClass and css or u''
return '<a href="%s?%s"%s>%s</a>' % (tableURL, query, cssClass, idx)
-
def update(self):
# 3 is is the placeholder for the first, current and last item.
total = self.prevBatchSize + self.nextBatchSize + 3
@@ -118,7 +117,7 @@
cssClasses.append('first')
if idx == lastIdx:
cssClasses.append('last')
-
+
if cssClasses:
css = ' '.join(cssClasses)
else:
Modified: z3c.table/branches/lazyvalues2/src/z3c/table/column.py
===================================================================
--- z3c.table/branches/lazyvalues2/src/z3c/table/column.py 2010-08-05 09:43:24 UTC (rev 115490)
+++ z3c.table/branches/lazyvalues2/src/z3c/table/column.py 2010-08-05 09:58:22 UTC (rev 115491)
@@ -31,7 +31,7 @@
def addColumn(self, class_, name, cellRenderer=None, headCellRenderer=None,
- colspan= None, weight=None, header=None, cssClasses=None, **kws):
+ colspan=None, weight=None, header=None, cssClasses=None, **kws):
if not interfaces.IColumn.implementedBy(class_):
raise ValueError('class_ %s must implement IColumn.' % class_)
column = class_(self.context, self.request, self)
@@ -60,7 +60,7 @@
# probably not IPhysicallyLocatable but still could have a __name__
try:
return api.getName(item)
- except TypeError, e:
+ except TypeError:
return item.__name__
@@ -151,10 +151,12 @@
@apply
def selectedItem():
+
# use the items form the table
def get(self):
if len(self.table.selectedItems):
return list(self.table.selectedItems).pop()
+
def set(self, value):
self.table.selectedItems = [value]
return property(get, set)
@@ -178,8 +180,8 @@
def renderCell(self, item):
selected = u''
if item == self.selectedItem:
- selected='checked="checked"'
- return u'<input type="radio" class="%s" name="%s" value="%s" %s />' %(
+ selected = 'checked="checked"'
+ return u'<input type="radio" class="%s" name="%s" value="%s" %s />' % (
'radio-widget', self.getItemKey(item), self.getItemValue(item),
selected)
@@ -192,9 +194,11 @@
@apply
def selectedItems():
+
# use the items form the table
def get(self):
return self.table.selectedItems
+
def set(self, values):
self.table.selectedItems = values
return property(get, set)
@@ -224,10 +228,10 @@
def renderCell(self, item):
selected = u''
if item in self.selectedItems:
- selected='checked="checked"'
- return u'<input type="checkbox" class="%s" name="%s" value="%s" %s />' \
- %('checkbox-widget', self.getItemKey(item), self.getItemValue(item),
- selected)
+ selected = 'checked="checked"'
+ html = u'<input type="checkbox" class="%s" name="%s" value="%s" %s />'
+ return html % ('checkbox-widget', self.getItemKey(item),
+ self.getItemValue(item), selected)
class GetAttrColumn(Column):
Modified: z3c.table/branches/lazyvalues2/src/z3c/table/header.py
===================================================================
--- z3c.table/branches/lazyvalues2/src/z3c/table/header.py 2010-08-05 09:43:24 UTC (rev 115490)
+++ z3c.table/branches/lazyvalues2/src/z3c/table/header.py 2010-08-05 09:58:22 UTC (rev 115491)
@@ -99,4 +99,3 @@
queryString,
zope.i18n.translate(_('Sort'), context=self.request),
zope.i18n.translate(self.column.header, context=self.request))
-
Modified: z3c.table/branches/lazyvalues2/src/z3c/table/interfaces.py
===================================================================
--- z3c.table/branches/lazyvalues2/src/z3c/table/interfaces.py 2010-08-05 09:43:24 UTC (rev 115490)
+++ z3c.table/branches/lazyvalues2/src/z3c/table/interfaces.py 2010-08-05 09:58:22 UTC (rev 115491)
@@ -87,7 +87,7 @@
description=(u'CSS class for selected rows.'),
value_type=zope.schema.TextLine(
title=_(u'Reverse sort order name'),
- description=_(u'Reverse sort order name')
+ description=_(u'Reverse sort order name'),
),
default=[u'descending', u'reverse', u'down'],
required=False)
@@ -193,27 +193,28 @@
"""Column provider"""
id = zope.schema.TextLine(
- title = _(u'Id'),
- description = _(u'The column id'),
- default = None)
+ title=_(u'Id'),
+ description=_(u'The column id'),
+ default=None)
# customize this part if needed
colspan = zope.schema.Int(
- title = _(u'Colspan'),
- description = _(u'The colspan value'),
- default = 0)
+ title=_(u'Colspan'),
+ description=_(u'The colspan value'),
+ default=0)
weight = zope.schema.Int(
- title = _(u'Weight'),
- description = _(u'The column weight'),
- default = 0)
+ title=_(u'Weight'),
+ description=_(u'The column weight'),
+ default=0)
header = zope.schema.TextLine(
- title = _(u'Header name'),
- description = _(u'The header name'),
- default = u'')
+ title=_(u'Header name'),
+ description=_(u'The header name'),
+ default=u'')
- cssClasses = zope.interface.Attribute('Dict of element name and CSS classes')
+ cssClasses = zope.interface.Attribute(
+ 'Dict of element name and CSS classes')
def getColspan(item):
"""Colspan value based on the given item."""
Modified: z3c.table/branches/lazyvalues2/src/z3c/table/table.py
===================================================================
--- z3c.table/branches/lazyvalues2/src/z3c/table/table.py 2010-08-05 09:43:24 UTC (rev 115490)
+++ z3c.table/branches/lazyvalues2/src/z3c/table/table.py 2010-08-05 09:58:22 UTC (rev 115491)
@@ -151,11 +151,11 @@
colspan = colspanCounter = col.getColspan(item)
# adjust colspan because we define 0, 2, 3, etc.
if colspanCounter > 0:
- colspanCounter -=1
+ colspanCounter -= 1
if colspan == 0 and colspanCounter > 0:
# override col if colspan is 0 and colspan coutner not 0
- colspanCounter -=1
+ colspanCounter -= 1
colspan = 0
# now we are ready to setup dummy colspan cells
col = column.NoneCell(self.context, self.request, self)
@@ -175,11 +175,11 @@
def getSortOn(self):
"""Returns sort on column id."""
- return self.request.get(self.prefix +'-sortOn', self.sortOn)
+ return self.request.get(self.prefix + '-sortOn', self.sortOn)
def getSortOrder(self):
"""Returns sort order criteria."""
- return self.request.get(self.prefix +'-sortOrder',
+ return self.request.get(self.prefix + '-sortOrder',
self.sortOrder)
def sortRows(self):
@@ -194,11 +194,11 @@
# batch
def getBatchSize(self):
- return int(self.request.get(self.prefix +'-batchSize',
+ return int(self.request.get(self.prefix + '-batchSize',
self.batchSize))
def getBatchStart(self):
- return int(self.request.get(self.prefix +'-batchStart',
+ return int(self.request.get(self.prefix + '-batchStart',
self.batchStart))
def batchRows(self):
@@ -261,7 +261,7 @@
append = rows.append
for row in self.rows:
append(self.renderRow(row, cssClasses[counter % 2]))
- counter +=1
+ counter += 1
return u''.join(rows)
def renderRow(self, row, cssClass=None):
Modified: z3c.table/branches/lazyvalues2/src/z3c/table/tests.py
===================================================================
--- z3c.table/branches/lazyvalues2/src/z3c/table/tests.py 2010-08-05 09:43:24 UTC (rev 115490)
+++ z3c.table/branches/lazyvalues2/src/z3c/table/tests.py 2010-08-05 09:58:22 UTC (rev 115491)
@@ -151,27 +151,28 @@
return unittest.TestSuite((
doctest.DocFileSuite('README.txt',
setUp=testing.setUp, tearDown=testing.tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+ optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
),
doctest.DocFileSuite('sequence.txt',
setUp=testing.setUp, tearDown=testing.tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+ optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
),
doctest.DocFileSuite('sort.txt',
setUp=testing.setUp, tearDown=testing.tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+ optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
),
doctest.DocFileSuite('batch.txt',
setUp=testing.setUp, tearDown=testing.tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS|doctest.REPORT_UDIFF,
+ optionflags=(doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS |
+ doctest.REPORT_UDIFF),
),
doctest.DocFileSuite('miscellaneous.txt',
setUp=testing.setUp, tearDown=testing.tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+ optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
),
doctest.DocFileSuite('column.txt',
setUp=testing.setUp, tearDown=testing.tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+ optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
),
unittest.makeSuite(TestTable),
unittest.makeSuite(TestSequenceTable),
Modified: z3c.table/branches/lazyvalues2/src/z3c/table/value.py
===================================================================
--- z3c.table/branches/lazyvalues2/src/z3c/table/value.py 2010-08-05 09:43:24 UTC (rev 115490)
+++ z3c.table/branches/lazyvalues2/src/z3c/table/value.py 2010-08-05 09:58:22 UTC (rev 115491)
@@ -50,7 +50,6 @@
zope.component.adapts(zope.interface.Interface, IBrowserRequest,
interfaces.ISequenceTable)
-
@property
def values(self):
- return self.context
\ No newline at end of file
+ return self.context
More information about the checkins
mailing list