[Checkins] SVN: z3c.table/branches/lazyvalues2/src/z3c/table/ simplify use of NoneCell

[Godefroid Chapelle]

Log message for revision 115825:
  simplify use of NoneCell

Changed:
  U   z3c.table/branches/lazyvalues2/src/z3c/table/column.py
  U   z3c.table/branches/lazyvalues2/src/z3c/table/miscellaneous.txt
  U   z3c.table/branches/lazyvalues2/src/z3c/table/table.py
  U   z3c.table/branches/lazyvalues2/src/z3c/table/tests.py

-=-
Modified: z3c.table/branches/lazyvalues2/src/z3c/table/column.py
===================================================================
--- z3c.table/branches/lazyvalues2/src/z3c/table/column.py	2010-08-20 08:34:31 UTC (rev 115824)
+++ z3c.table/branches/lazyvalues2/src/z3c/table/column.py	2010-08-20 09:06:58 UTC (rev 115825)
@@ -124,6 +124,9 @@
 
     zope.interface.implements(interfaces.INoneCell)
 
+    def __init__(self):
+        pass
+
     def getColspan(self, item):
         return 0
 
@@ -377,6 +380,7 @@
             return self.defaultValue
         return super(EMailColumn, self).renderCell(item)
 
+
 class SelectedItemColumn(LinkColumn):
     """Link which can set an item."""
 

Modified: z3c.table/branches/lazyvalues2/src/z3c/table/miscellaneous.txt
===================================================================
--- z3c.table/branches/lazyvalues2/src/z3c/table/miscellaneous.txt	2010-08-20 08:34:31 UTC (rev 115824)
+++ z3c.table/branches/lazyvalues2/src/z3c/table/miscellaneous.txt	2010-08-20 09:06:58 UTC (rev 115825)
@@ -93,7 +93,7 @@
 
   >>> from z3c.table.testing import Content
   >>> firstItem = Content('First', 1)
-  >>> noneCellColumn = column.addColumn(simpleTable, column.NoneCell, u'none')
+  >>> noneCellColumn = column.NoneCell()
   >>> noneCellColumn.renderCell(firstItem)
   u''
 

Modified: z3c.table/branches/lazyvalues2/src/z3c/table/table.py
===================================================================
--- z3c.table/branches/lazyvalues2/src/z3c/table/table.py	2010-08-20 08:34:31 UTC (rev 115824)
+++ z3c.table/branches/lazyvalues2/src/z3c/table/table.py	2010-08-20 09:06:58 UTC (rev 115825)
@@ -162,11 +162,11 @@
                     colspanCounter -= 1
 
             if colspan == 0 and colspanCounter > 0:
-                # override col if colspan is 0 and colspan coutner not 0
+                # override col if colspan is 0 and colspan counter not 0
                 colspanCounter -= 1
                 colspan = 0
                 # now we are ready to setup dummy colspan cells
-                col = column.NoneCell(self.context, self.request, self)
+                col = column.NoneCell()
 
             # we reached the end of the table and have still colspan
             if (countdown - colspan) < 0:

Modified: z3c.table/branches/lazyvalues2/src/z3c/table/tests.py
===================================================================
--- z3c.table/branches/lazyvalues2/src/z3c/table/tests.py	2010-08-20 08:34:31 UTC (rev 115824)
+++ z3c.table/branches/lazyvalues2/src/z3c/table/tests.py	2010-08-20 09:06:58 UTC (rev 115825)
@@ -134,8 +134,7 @@
         return column.NoneCell
 
     def getTestPos(self):
-        t = table.Table(None, TestRequest())
-        return ({}, TestRequest(), t)
+        return ()
 
 
 class TestNameColumn(z3c.testing.InterfaceBaseTest):