[Checkins] SVN: megrok.z3cform.tabular/trunk/s pep8
Christian Klinger
cklinger at novareto.de
Thu Oct 22 10:55:49 EDT 2009
Log message for revision 105218:
pep8
Changed:
U megrok.z3cform.tabular/trunk/setup.py
U megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/README.txt
U megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/components.py
U megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_deleteTable.py
U megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_formtableinlayout.py
U megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_readme.py
U megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_tabular.py
-=-
Modified: megrok.z3cform.tabular/trunk/setup.py
===================================================================
--- megrok.z3cform.tabular/trunk/setup.py 2009-10-22 14:54:12 UTC (rev 105217)
+++ megrok.z3cform.tabular/trunk/setup.py 2009-10-22 14:55:49 UTC (rev 105218)
@@ -2,11 +2,12 @@
import os
version = '0.1'
+readme = open(join('src', 'megrok', 'z3cform', 'tabular', 'README.txt')).read()
setup(name='megrok.z3cform.tabular',
version=version,
description="grok add on for createing an Wizard",
- long_description=open("README.txt").read() + "\n" +
+ long_description=readme + "\n" +
open(os.path.join("docs", "HISTORY.txt")).read(),
# Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers
classifiers=[
Modified: megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/README.txt
===================================================================
--- megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/README.txt 2009-10-22 14:54:12 UTC (rev 105217)
+++ megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/README.txt 2009-10-22 14:55:49 UTC (rev 105218)
@@ -13,6 +13,7 @@
´megrok.z3cform.tabular´ is based on these existing megrok packages
+ - megrok.layout
- megrok.z3ctable
- megrok.z3cform.base
- megrok.z3cform.ui
@@ -60,11 +61,11 @@
>>> class FormTableView(FormTable):
... grok.context(Container)
... extends(FormTable)
-
- ... @button.buttonAndHandler(u'Modify')
- ... def handleApply(self, action):
+ ...
+ ... @button.buttonAndHandler(u'ChangeWorkflowState')
+ ... def handleChangeWorkflowState(self, action):
... print 'success'
-
+ ...
... def render(self):
... return self.renderFormTable()
@@ -89,7 +90,10 @@
>>> grok.testing.grok_component('name', Name)
True
-Ok now we can call the ´FormTableView´ on the container
+Ok now we can call the ´FormTableView´ on the container. We
+should see a table with three rows and two columns.
+There is a default ´Cancel´ button and our custom
+´ChangeWorkflowState´button.
>>> from zope.publisher.browser import TestRequest
>>> request = TestRequest()
@@ -140,7 +144,15 @@
name="formTable.buttons.cancel"
class="submit-widget button-field" value="Cancel"
type="submit" />
+ <input id="formTable-buttons-changeworkflowstate"
+ name="formTable.buttons.changeworkflowstate"
+ class="submit-widget button-field"
+ value="ChangeWorkflowState" type="submit" />
</div>
</div>
</form>
+This package works nicely with megrok.layout. There are some additional
+BaseClasses available. Please take a look on the tests.
+
+Enjoy...
Modified: megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/components.py
===================================================================
--- megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/components.py 2009-10-22 14:54:12 UTC (rev 105217)
+++ megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/components.py 2009-10-22 14:55:49 UTC (rev 105218)
@@ -1,15 +1,15 @@
import grokcore.component as grok
import grokcore.view as view
+import megrok.layout
import z3c.tabular.table
+
+from grokcore.view.interfaces import ITemplate as IGrokTemplate
from z3c.template.template import getPageTemplate
-from grokcore.view.interfaces import ITemplate as IGrokTemplate
-import megrok.layout
+
class BaseTable(view.View):
grok.baseclass()
-
status = None # The Tabular stuff checks if the status is None
-
template = None
def render(self):
@@ -17,11 +17,9 @@
return template(self)
render.base_method = True
-
renderFormTable = render
-
class FormTable(BaseTable, z3c.tabular.table.FormTable):
""" A Form Table Class. You have to define your buttons and stuff yourself
"""
@@ -44,7 +42,6 @@
""" A Form Table Class which get renderd inside a Layout
"""
grok.baseclass()
-
template = None
def update(self):
@@ -55,11 +52,14 @@
template = getPageTemplate()
return template(self)
- render.base_method = True
+ render.base_method = True
renderFormTable = render
-class DeleteFormTablePage(megrok.layout.Page, z3c.tabular.table.DeleteFormTable):
+class DeleteFormTablePage(megrok.layout.Page,
+ z3c.tabular.table.DeleteFormTable):
+ """ A Form Table with has support for removing objects form a folder
+ """
grok.baseclass()
template = None
@@ -72,5 +72,5 @@
template = getPageTemplate()
return template(self)
- render.base_method = True
+ render.base_method = True
renderFormTable = render
Modified: megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_deleteTable.py
===================================================================
--- megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_deleteTable.py 2009-10-22 14:54:12 UTC (rev 105217)
+++ megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_deleteTable.py 2009-10-22 14:55:49 UTC (rev 105218)
@@ -20,7 +20,7 @@
>>> from zope.component import getMultiAdapter
>>> from zope.publisher.browser import TestRequest
- >>> delete_view = getMultiAdapter((cont, TestRequest()), name=u"deletetable")
+ >>> delete_view = getMultiAdapter((cont, TestRequest()), name=u"deletetable")
>>> print delete_view()
<form action="http://127.0.0.1" method="post"
enctype="multipart/form-data" class="edit-form"
@@ -109,11 +109,13 @@
"""
import grokcore.component as grok
-from megrok.z3ctable.ftests import Container, Content
+
+from megrok.z3cform.base import button
from megrok.z3cform.tabular import DeleteFormTable
-from megrok.z3cform.base import button
from megrok.z3ctable import CheckBoxColumn, NameColumn
+from megrok.z3ctable.ftests import Container, Content
+
class DeleteTable(DeleteFormTable):
grok.context(Container)
@@ -125,6 +127,7 @@
def render(self):
return self.renderFormTable()
+
class CheckBox(CheckBoxColumn):
grok.name('checkBox')
grok.context(Container)
@@ -135,9 +138,9 @@
class Name(NameColumn):
- grok.name('MyName')
+ grok.name('MyName')
grok.context(Container)
- weight = 99
+ weight = 99
def test_suite():
@@ -147,4 +150,3 @@
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
suite.layer = FunctionalLayer
return suite
-
Modified: megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_formtableinlayout.py
===================================================================
--- megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_formtableinlayout.py 2009-10-22 14:54:12 UTC (rev 105217)
+++ megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_formtableinlayout.py 2009-10-22 14:55:49 UTC (rev 105218)
@@ -23,7 +23,7 @@
>>> from zope.component import getMultiAdapter
>>> from zope.publisher.browser import TestRequest
- >>> table_in_layout = getMultiAdapter((cont, TestRequest()), name=u"tableinlayout")
+ >>> table_in_layout = getMultiAdapter((cont, TestRequest()), name=u"tableinlayout")
>>> print table_in_layout()
<html><form action="http://127.0.0.1" method="post"
enctype="multipart/form-data" class="edit-form"
@@ -64,8 +64,8 @@
</div>
</form>
</html>
- >>> delete_table_in_layout = getMultiAdapter((cont, TestRequest()), name=u"formtablepagewithtemplate")
- >>> print delete_table_in_layout()
+ >>> delete_table_in_layout = getMultiAdapter((cont, TestRequest()), name=u"formtablepagewithtemplate")
+ >>> print delete_table_in_layout()
<html><div id="content">
<form action="http://127.0.0.1" method="post"
enctype="multipart/form-data" class="edit-form"
@@ -107,17 +107,18 @@
</form>
</div>
</html>
-
"""
import grokcore.component as grok
-from megrok.z3ctable.ftests import Container, Content
+
+from megrok import layout
+from megrok.z3cform.base import button
from megrok.z3cform.tabular import FormTablePage, DeleteFormTablePage
-from megrok.z3cform.base import button
from megrok.z3ctable import CheckBoxColumn, NameColumn, table
+from megrok.z3ctable.ftests import Container, Content
from zope.component import Interface
-from megrok import layout
+
class Layout(layout.Layout):
grok.context(Interface)
@@ -133,19 +134,18 @@
class Uid(NameColumn):
- grok.name('uid')
+ grok.name('uid')
table(FormTablePage)
grok.context(Container)
weight = 1
-#
class FormTablePageWithTemplate(DeleteFormTablePage):
grok.context(Container)
class Name(NameColumn):
- grok.name('Name')
+ grok.name('Name')
table(FormTablePageWithTemplate)
grok.context(Container)
weight = 1
@@ -158,4 +158,3 @@
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
suite.layer = FunctionalLayer
return suite
-
Modified: megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_readme.py
===================================================================
--- megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_readme.py 2009-10-22 14:54:12 UTC (rev 105217)
+++ megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_readme.py 2009-10-22 14:55:49 UTC (rev 105218)
@@ -13,4 +13,3 @@
suite = unittest.TestSuite()
suite.addTest(readme)
return suite
-
Modified: megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_tabular.py
===================================================================
--- megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_tabular.py 2009-10-22 14:54:12 UTC (rev 105217)
+++ megrok.z3cform.tabular/trunk/src/megrok/z3cform/tabular/tests/test_tabular.py 2009-10-22 14:55:49 UTC (rev 105218)
@@ -20,7 +20,7 @@
>>> from zope.component import getMultiAdapter
>>> from zope.publisher.browser import TestRequest
- >>> table_view = getMultiAdapter((cont, TestRequest()), name=u"myformtable")
+ >>> table_view = getMultiAdapter((cont, TestRequest()), name=u"myformtable")
>>> print table_view()
<form action="http://127.0.0.1" method="post"
enctype="multipart/form-data" class="edit-form"
@@ -103,38 +103,38 @@
</div>
</div>
</form>
- </body>
+ </body>
</html>
-
"""
import grokcore.component as grok
-from megrok.z3ctable.ftests import Container, Content
+
+from megrok.z3cform.base import button
from megrok.z3cform.tabular import FormTable
-from megrok.z3cform.base import button
from megrok.z3ctable import CheckBoxColumn, NameColumn, table
+from megrok.z3ctable.ftests import Container, Content
+
class MyFormTable(FormTable):
grok.context(Container)
-
status = None
def render(self):
return self.renderFormTable()
+
class Name(NameColumn):
grok.name('checkBox')
grok.context(Container)
table(MyFormTable)
weight = 0
-#
class ContentsTableWithTemplate(FormTable):
grok.context(Container)
-
status = None
+
class MyId(NameColumn):
grok.name('myid')
grok.context(Container)
@@ -149,4 +149,3 @@
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
suite.layer = FunctionalLayer
return suite
-
More information about the checkins
mailing list