[Checkins] SVN: Sandbox/ulif/grok-adminui/ Merged trunk into branch.
Uli Fouquet
uli at gnufix.de
Mon Jul 16 23:08:50 EDT 2007
Log message for revision 78050:
Merged trunk into branch.
Changed:
U Sandbox/ulif/grok-adminui/CREDITS.txt
U Sandbox/ulif/grok-adminui/buildout.cfg
_U Sandbox/ulif/grok-adminui/doc/
A Sandbox/ulif/grok-adminui/doc/examples/
U Sandbox/ulif/grok-adminui/doc/grok2html.py
U Sandbox/ulif/grok-adminui/doc/grok2pdf.sh
U Sandbox/ulif/grok-adminui/doc/groktut/a_second_model/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/a_second_model/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/a_second_model/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model2/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model2/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model2/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/buildout_tut.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/completely_python_driven_views/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/completely_python_driven_views/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/completely_python_driven_views/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/containers/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/containers/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/containers/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/doing_some_calculation_before_viewing_a_page/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/doing_some_calculation_before_viewing_a_page/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/doing_some_calculation_before_viewing_a_page/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/explicitly_associating_a_view_with_a_model/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/explicitly_associating_a_view_with_a_model/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/explicitly_associating_a_view_with_a_model/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/generating_html_from_python/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/generating_html_from_python/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/generating_html_from_python/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/making_our_page_dynamic/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/making_our_page_dynamic/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/making_our_page_dynamic/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters2/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters2/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters2/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/redirection/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/redirection/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/redirection/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/setting_the_content_type/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/setting_the_content_type/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/setting_the_content_type/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/showing_the_value_in_the_form/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/showing_the_value_in_the_form/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/showing_the_value_in_the_form/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/simple_forms/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/simple_forms/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/simple_forms/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/simple_forms2/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/simple_forms2/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/simple_forms2/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/static_resources_for_our_web_page/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/static_resources_for_our_web_page/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/static_resources_for_our_web_page/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/storing_data/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/storing_data/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/storing_data/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence2/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence2/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence2/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence3/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence3/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence3/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/groktut/using_view_methods/buildout.cfg
U Sandbox/ulif/grok-adminui/doc/groktut/using_view_methods/setup.py
U Sandbox/ulif/grok-adminui/doc/groktut/using_view_methods/src/sample/configure.zcml
U Sandbox/ulif/grok-adminui/doc/minitutorials/index.txt
A Sandbox/ulif/grok-adminui/doc/setup.py
U Sandbox/ulif/grok-adminui/doc/tutorial.txt
D Sandbox/ulif/grok-adminui/grokblog/
D Sandbox/ulif/grok-adminui/ldapaddressbook/
U Sandbox/ulif/grok-adminui/setup.py
U Sandbox/ulif/grok-adminui/src/grok/components.py
U Sandbox/ulif/grok-adminui/src/grok/configure.zcml
U Sandbox/ulif/grok-adminui/src/grok/ftests/traversal/modeltraverse.py
U Sandbox/ulif/grok-adminui/src/grok/ftests/traversal/traverser.py
A Sandbox/ulif/grok-adminui/src/grok/ftests/traversal/traverser_sets_parent.py
U Sandbox/ulif/grok-adminui/src/grok/meta.py
U Sandbox/ulif/grok-adminui/src/grok/templatereg.py
U Sandbox/ulif/grok-adminui/src/grok/tests/view/dirtemplatesonly.py
U Sandbox/ulif/grok-adminui/src/grok/util.py
U Sandbox/ulif/grok-adminui/src/grok/zcml.py
-=-
Modified: Sandbox/ulif/grok-adminui/CREDITS.txt
===================================================================
--- Sandbox/ulif/grok-adminui/CREDITS.txt 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/CREDITS.txt 2007-07-17 03:08:50 UTC (rev 78050)
@@ -23,6 +23,8 @@
* Wim Boucqaert (admin interface layout improvements)
+* Mikhail Kashkin
+
* ME GROK (team mascot)
Thank you
Modified: Sandbox/ulif/grok-adminui/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,21 +1,18 @@
[buildout]
-develop = . grokwiki ldapaddressbook
-parts = grokwiki instance data test
+develop = . doc grokwiki
+parts = docs grokwiki zopectl data test
find-links = http://download.zope.org/distribution/
-[zope3]
-# this dead chicken is needed by some other recipe(s)
-location =
+[docs]
+recipe = zc.recipe.egg
+eggs = grokdocs
[grokwiki]
-recipe = zc.zope3recipes:app
+recipe = zc.zope3recipes>=0.5.3:application
eggs = grokwiki
site.zcml = <include package="grokwiki" />
<include package="zope.app.twisted" />
- <securityPolicy
- component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-
<unauthenticatedPrincipal id="zope.anybody"
title="Unauthenticated User" />
<unauthenticatedGroup id="zope.Anybody"
@@ -47,7 +44,8 @@
[data]
recipe = zc.recipe.filestorage
-[instance]
+# this section named so that the start/stop script is called bin/zopectl
+[zopectl]
recipe = zc.zope3recipes:instance
application = grokwiki
zope.conf = ${data:zconfig}
Property changes on: Sandbox/ulif/grok-adminui/doc
___________________________________________________________________
Name: svn:ignore
+ grokdocs.egg-info
tutorial.*
Copied: Sandbox/ulif/grok-adminui/doc/examples (from rev 78049, grok/trunk/doc/examples)
Modified: Sandbox/ulif/grok-adminui/doc/grok2html.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/grok2html.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/grok2html.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -2,8 +2,6 @@
import codecs
import sys
-sys.path.append('/opt/odd-bobs/Zope3/src')
-
import docutils.core
from docutils.writers.html4css1 import Writer
@@ -22,9 +20,11 @@
'halt_level': 6,
'input_encoding': 'utf8',
'output_encoding': 'utf8',
- 'initial_header_level': 2
+ 'initial_header_level': 2,
+ # don't try to include the stylesheet (docutils gets hiccups)
+ 'stylesheet_path': '',
}
- # 'output_encoding': 'utf8',
+
writer = Writer()
writer.translator_class = ZopeTranslator
html = docutils.core.publish_string(
@@ -113,14 +113,19 @@
{'href':'/minitutorials/index.html','title':u'How Tos','klass':''},
]
-if __name__ == '__main__':
- source_dir = '.'
- www_dir = '/opt/odd-bobs/grok-www'
+def main(argv=None):
+ if argv is None:
+ argv = sys.argv[1:]
+
+ if not len(argv) == 1:
+ print "Usage: grok2html OUTDIR"
+ sys.exit(1)
+
+ source_dir = os.path.dirname(__file__)
+ os.chdir(source_dir)
+ www_dir = argv[0]
+
rest_files = []
- if www_dir == '':
- print 'Please define the target directory for html files'
- import sys
- sys.exit()
rest_files.append(RestFile('index',
os.path.join(source_dir, 'index.txt'),
os.path.join(www_dir, 'index.html')))
@@ -142,3 +147,5 @@
template = PageTemplateFile(os.path.join(source_dir, 'template.pt'))
create_html(rest_files, template)
+if __name__ == '__main__':
+ main()
Modified: Sandbox/ulif/grok-adminui/doc/grok2pdf.sh
===================================================================
--- Sandbox/ulif/grok-adminui/doc/grok2pdf.sh 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/grok2pdf.sh 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,5 @@
#!/bin/sh
rst2latex.py --use-latex-toc --stylesheet=style.tex tutorial.txt > tutorial.tex
pdflatex tutorial.tex
+# run pdflatex a second time for contents
+pdflatex tutorial.tex
Modified: Sandbox/ulif/grok-adminui/doc/groktut/a_second_model/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/a_second_model/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/a_second_model/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/a_second_model/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/a_second_model/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/a_second_model/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/a_second_model/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/a_second_model/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/a_second_model/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model2/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model2/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model2/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model2/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model2/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model2/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model2/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model2/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/a_view_for_a_model2/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/buildout_tut.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/buildout_tut.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/buildout_tut.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,24 +1,17 @@
[buildout]
-parts = data app instance test
+parts = data app zopectl test
eggs-directory = ../eggs
find-links = http://download.zope.org/distribution/
-[zope3]
-# this dead chicken is needed by some other recipe(s)
-location =
-
[data]
recipe = zc.recipe.filestorage
[app]
-recipe = zc.zope3recipes:app
+recipe = zc.zope3recipes>=0.5.3:application
eggs = sample
site.zcml = <include package="sample" />
<include package="zope.app.twisted" />
- <securityPolicy
- component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-
<unauthenticatedPrincipal id="zope.anybody"
title="Unauthenticated User" />
<unauthenticatedGroup id="zope.Anybody"
@@ -47,7 +40,8 @@
<grant role="zope.Manager"
principal="zope.manager" />
-[instance]
+# this section named so that the start/stop script is called bin/zopectl
+[zopectl]
recipe = zc.zope3recipes:instance
application = app
zope.conf = ${data:zconfig}
Modified: Sandbox/ulif/grok-adminui/doc/groktut/completely_python_driven_views/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/completely_python_driven_views/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/completely_python_driven_views/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/completely_python_driven_views/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/completely_python_driven_views/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/completely_python_driven_views/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/completely_python_driven_views/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/completely_python_driven_views/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/completely_python_driven_views/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/containers/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/containers/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/containers/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/containers/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/containers/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/containers/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/containers/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/containers/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/containers/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/doing_some_calculation_before_viewing_a_page/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/doing_some_calculation_before_viewing_a_page/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/doing_some_calculation_before_viewing_a_page/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/doing_some_calculation_before_viewing_a_page/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/doing_some_calculation_before_viewing_a_page/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/doing_some_calculation_before_viewing_a_page/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/doing_some_calculation_before_viewing_a_page/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/doing_some_calculation_before_viewing_a_page/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/doing_some_calculation_before_viewing_a_page/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/explicitly_associating_a_view_with_a_model/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/explicitly_associating_a_view_with_a_model/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/explicitly_associating_a_view_with_a_model/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/explicitly_associating_a_view_with_a_model/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/explicitly_associating_a_view_with_a_model/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/explicitly_associating_a_view_with_a_model/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/explicitly_associating_a_view_with_a_model/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/explicitly_associating_a_view_with_a_model/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/explicitly_associating_a_view_with_a_model/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/generating_html_from_python/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/generating_html_from_python/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/generating_html_from_python/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/generating_html_from_python/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/generating_html_from_python/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/generating_html_from_python/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/generating_html_from_python/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/generating_html_from_python/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/generating_html_from_python/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/making_our_page_dynamic/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/making_our_page_dynamic/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/making_our_page_dynamic/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/making_our_page_dynamic/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/making_our_page_dynamic/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/making_our_page_dynamic/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/making_our_page_dynamic/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/making_our_page_dynamic/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/making_our_page_dynamic/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters2/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters2/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters2/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters2/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters2/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters2/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters2/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters2/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/reading_url_parameters2/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/redirection/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/redirection/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/redirection/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/redirection/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/redirection/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/redirection/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/redirection/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/redirection/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/redirection/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/setting_the_content_type/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/setting_the_content_type/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/setting_the_content_type/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/setting_the_content_type/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/setting_the_content_type/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/setting_the_content_type/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/setting_the_content_type/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/setting_the_content_type/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/setting_the_content_type/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/showing_the_value_in_the_form/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/showing_the_value_in_the_form/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/showing_the_value_in_the_form/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/showing_the_value_in_the_form/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/showing_the_value_in_the_form/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/showing_the_value_in_the_form/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/showing_the_value_in_the_form/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/showing_the_value_in_the_form/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/showing_the_value_in_the_form/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/simple_forms/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/simple_forms/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/simple_forms/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/simple_forms/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/simple_forms/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/simple_forms/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/simple_forms/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/simple_forms/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/simple_forms/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/simple_forms2/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/simple_forms2/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/simple_forms2/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/simple_forms2/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/simple_forms2/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/simple_forms2/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/simple_forms2/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/simple_forms2/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/simple_forms2/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/static_resources_for_our_web_page/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/static_resources_for_our_web_page/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/static_resources_for_our_web_page/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/static_resources_for_our_web_page/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/static_resources_for_our_web_page/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/static_resources_for_our_web_page/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/static_resources_for_our_web_page/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/static_resources_for_our_web_page/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/static_resources_for_our_web_page/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/storing_data/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/storing_data/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/storing_data/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/storing_data/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/storing_data/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/storing_data/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/storing_data/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/storing_data/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/storing_data/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence2/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence2/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence2/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence2/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence2/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence2/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence2/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence2/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence2/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence3/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence3/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence3/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence3/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence3/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence3/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence3/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence3/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/the_rules_of_persistence3/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/groktut/using_view_methods/buildout.cfg
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/using_view_methods/buildout.cfg 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/using_view_methods/buildout.cfg 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,3 @@
[buildout]
-develop = .
+develop = . ../../..
extends = ../buildout_tut.cfg
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/doc/groktut/using_view_methods/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/using_view_methods/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/using_view_methods/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -20,9 +20,9 @@
zip_safe=False,
install_requires=['setuptools',
'grok',
- # -*- Extra requirements: -*-
+ # Add extra requirements here
],
entry_points="""
- # -*- Entry points: -*-
+ # Add entry points here
""",
)
Modified: Sandbox/ulif/grok-adminui/doc/groktut/using_view_methods/src/sample/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/doc/groktut/using_view_methods/src/sample/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/groktut/using_view_methods/src/sample/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1 +1,5 @@
-<grok package="." xmlns="http://namespaces.zope.org/grok" />
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grok-adminui/doc/minitutorials/index.txt
===================================================================
--- Sandbox/ulif/grok-adminui/doc/minitutorials/index.txt 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/minitutorials/index.txt 2007-07-17 03:08:50 UTC (rev 78050)
@@ -9,15 +9,15 @@
These mini-tutorials have been contributed by members of the Grok community.
* `Newbie Search Tutorial </minitutorials/searching.html>`_:
- Grok supports the vanilla indexing services available in Zope 3 straight out of
- the box. Catalog uses developer defined indexes for searching. In other words,
- you have to define the indexes you want to use to search you objects before you
- perform the actual search.
+ Grok supports the vanilla indexing services available in Zope 3
+ straight out of the box. The catalog uses developer-defined indexes
+ for searching. In other words, you have to define the indexes you
+ want to use to search you objects before you perform the actual
+ search.
+
* `Macros With Grok </minitutorials/macros.html>`_:
- Grok supports the vanilla indexing services available in Zope 3 straight out of
- the box. Catalog uses developer defined indexes for searching. In other words,
- you have to define the indexes you want to use to search you objects before you
- perform the actual search.
-
+ Macros are a way to define a chunk of presentation in one template,
+ and share it in others. Changes to the macro are immediately
+ reflected in all templates, that use it.
Copied: Sandbox/ulif/grok-adminui/doc/setup.py (from rev 78049, grok/trunk/doc/setup.py)
===================================================================
--- Sandbox/ulif/grok-adminui/doc/setup.py (rev 0)
+++ Sandbox/ulif/grok-adminui/doc/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -0,0 +1,14 @@
+from setuptools import setup, find_packages
+
+setup(
+ name='grokdocs',
+ install_requires=['docutils',
+ 'zope.pagetemplate',
+ 'zope.app.renderer'
+ ],
+ py_modules = ['grok2html'],
+ entry_points="""
+ [console_scripts]
+ grok2html = grok2html:main
+ """
+ )
Modified: Sandbox/ulif/grok-adminui/doc/tutorial.txt
===================================================================
--- Sandbox/ulif/grok-adminui/doc/tutorial.txt 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/doc/tutorial.txt 2007-07-17 03:08:50 UTC (rev 78050)
@@ -209,16 +209,12 @@
Starting up Zope
----------------
-You can go into the ``Sample`` project directory now::
+You can go into the ``Sample`` project directory now and start up the
+Zope instance that has been installed::
$ cd Sample
+ $ bin/zopectl fg
-A Zope 3 instance has been installed in the 'parts/instance'
-directory. You can start it (into the foreground) by typing the
-following::
-
- $ bin/instance fg
-
This will make Zope 3 available on port 8080, and you can log in with
username ``grok`` and password ``grok``. Assuming you've started up
Zope on your localhost, you can go to it here:
@@ -254,7 +250,7 @@
Practice restarting Zope now, as you'll end up doing it a lot during
this tutorial. It's just stopping Zope and starting it again:
-`CTRL-c`` and then ``bin/instance fg`` from your Sample
+`CTRL-c`` and then ``bin/zopectl fg`` from your Sample
project directory.
An empty Grok project
@@ -281,10 +277,15 @@
upload your project to the Python Cheeseshop. We will discuss this in
more detail later in this tutorial. (XXX)
-We have already seen the ``parts`` directory. This directory contains
-configuration and data created by ``buildout``, such as the Zope
-object database (ZODB) instance.
+We have already seen the ``bin`` directory. It contains the startup
+script for the Zope instance (``bin/zopectl``) as well as the
+executable for the buildout system (``bin/buildout``) which can be
+used to re-build the Zope instance and possibly update the Grok and
+Zope packages.
+The ``parts`` directory contains configuration and data created by
+``buildout``, such as the Zope object database (ZODB) instance.
+
The actual code of the project will all be inside the ``src``
directory. In it is a Python package directory called ``sample`` with
the ``app.py`` file that grokproject said it would create. Let's look
@@ -413,8 +414,8 @@
template should have the same name as the class, but lowercased and
with the ``.pt`` postfix.
-Restart Zope (``CTRL-C, then ``parts/instance/bin/zopectl fg``). You
-can now go to a new web page called ``bye``:
+Restart Zope (``CTRL-C, then ``bin/zopectl fg``). You can now go to a
+new web page called ``bye``:
http://localhost:8080/test/bye
Modified: Sandbox/ulif/grok-adminui/setup.py
===================================================================
--- Sandbox/ulif/grok-adminui/setup.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/setup.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -14,7 +14,7 @@
packages=find_packages('src'),
package_dir = {'': 'src'},
include_package_data = True,
- zip_safe=False,
+ zip_safe=False,
install_requires=['setuptools',
'martian',
'simplejson',
@@ -35,6 +35,7 @@
'zope.component',
'zope.configuration',
'zope.dottedname',
+ 'zope.deprecation',
'zope.event',
'zope.formlib',
'zope.interface',
Modified: Sandbox/ulif/grok-adminui/src/grok/components.py
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/components.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/src/grok/components.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) 2006-2007 Zope Corporation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -11,8 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Grok components
-"""
+"""Grok components"""
import os
import persistent
@@ -52,10 +51,9 @@
import z3c.flashmessage.interfaces
-from martian import util
+import martian.util
+from grok import interfaces, formlib, util
-from grok import interfaces, formlib
-from grok.util import url
class Model(Contained, persistent.Persistent):
# XXX Inheritance order is important here. If we reverse this,
@@ -76,6 +74,7 @@
"""A top-level application object."""
interface.implements(interfaces.IApplication)
+
class Adapter(object):
def __init__(self, context):
@@ -155,7 +154,7 @@
elif name is not None and obj is None:
# create URL to view on context
obj = self.context
- return url(self.request, obj, name)
+ return util.url(self.request, obj, name)
def application_url(self, name=None):
obj = self.context
@@ -188,6 +187,7 @@
class XMLRPC(object):
pass
+
class JSON(BrowserPage):
def __call__(self):
@@ -196,6 +196,7 @@
method_result = mapply(method, (), self.request)
return simplejson.dumps(method_result)
+
class GrokPageTemplate(object):
def __repr__(self):
@@ -212,7 +213,7 @@
def __init__(self, template):
super(PageTemplate, self).__init__()
- if util.not_unicode_or_ascii(template):
+ if martian.util.not_unicode_or_ascii(template):
raise ValueError("Invalid page template. Page templates must be "
"unicode or ASCII.")
self.write(template)
@@ -221,7 +222,7 @@
# inline templates
# XXX unfortunately using caller_module means that
# PageTemplate cannot be subclassed
- self.__grok_module__ = util.caller_module()
+ self.__grok_module__ = martian.util.caller_module()
class PageTemplateFile(GrokPageTemplate, TrustedAppPT,
@@ -235,7 +236,7 @@
# inline templates
# XXX unfortunately using caller_module means that
# PageTemplateFile cannot be subclassed
- self.__grok_module__ = util.caller_module()
+ self.__grok_module__ = martian.util.caller_module()
class DirectoryResource(directoryresource.DirectoryResource):
@@ -281,7 +282,7 @@
def publishTraverse(self, request, name):
subob = self.traverse(name)
if subob is not None:
- return subob
+ return util.safely_locate_maybe(subob, self.context, name)
# XXX Special logic here to deal with containers. It would be
# good if we wouldn't have to do this here. One solution is to
@@ -324,6 +325,7 @@
# try to get the item from the container
return self.context.get(name)
+
default_form_template = PageTemplateFile(os.path.join(
'templates', 'default_edit_form.pt'))
default_form_template.__grok_name__ = 'default_edit_form'
@@ -331,6 +333,7 @@
'templates', 'default_display_form.pt'))
default_display_template.__grok_name__ = 'default_display_form'
+
class GrokForm(object):
"""Mix-in to console zope.formlib's forms with grok.View and to
add some more useful methods.
@@ -383,6 +386,7 @@
self.update_form()
return self.render()
+
class Form(GrokForm, form.FormBase, View):
# We're only reusing the form implementation from zope.formlib, we
# explicitly don't want to inherit the interface semantics (mostly
@@ -402,9 +406,11 @@
"'applyData' instead.", DeprecationWarning, 2)
return bool(self.applyData(obj, **data))
+
class AddForm(Form):
pass
+
class EditForm(GrokForm, form.EditFormBase, View):
# We're only reusing the form implementation from zope.formlib, we
# explicitly don't want to inherit the interface semantics (mostly
@@ -441,6 +447,7 @@
else:
self.status = 'No changes'
+
class DisplayForm(GrokForm, form.DisplayFormBase, View):
# We're only reusing the form implementation from zope.formlib, we
# explicitly don't want to inherit the interface semantics (mostly
@@ -449,6 +456,7 @@
template = default_display_template
+
class IndexesClass(object):
def __init__(self, name, bases=(), attrs=None):
if attrs is None:
@@ -468,6 +476,6 @@
self.__grok_indexes__ = indexes
# __grok_module__ is needed to make defined_locally() return True for
# inline templates
- self.__grok_module__ = util.caller_module()
-
+ self.__grok_module__ = martian.util.caller_module()
+
Indexes = IndexesClass('Indexes')
Modified: Sandbox/ulif/grok-adminui/src/grok/configure.zcml
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/configure.zcml 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/src/grok/configure.zcml 2007-07-17 03:08:50 UTC (rev 78050)
@@ -25,6 +25,9 @@
<include package="zope.app.renderer" />
<include package="zope.app.session" />
+ <securityPolicy
+ component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+
<!-- we register special IAbsoluteURL views on grok views so that
can have them inspect __view_name__ instead of __name__.
__name__ is already used as the class name, and overriding it
Modified: Sandbox/ulif/grok-adminui/src/grok/ftests/traversal/modeltraverse.py
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/ftests/traversal/modeltraverse.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/src/grok/ftests/traversal/modeltraverse.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -5,7 +5,7 @@
>>> import grok
>>> from grok.ftests.traversal.modeltraverse import Herd
>>> grok.grok('grok.ftests.traversal.modeltraverse')
- >>> getRootFolder()["herd"] = Herd()
+ >>> getRootFolder()["herd"] = Herd('The Big Mammoth Herd')
>>> from zope.testbrowser.testing import Browser
>>> browser = Browser()
@@ -15,6 +15,7 @@
<html>
<body>
<h1>Hello, Manfred!</h1>
+ <p>Manfred is part of The Big Mammoth Herd.</p>
</body>
</html>
@@ -23,6 +24,7 @@
<html>
<body>
<h1>Hello, Ellie!</h1>
+ <p>Ellie is part of The Big Mammoth Herd.</p>
</body>
</html>
@@ -31,6 +33,9 @@
class Herd(grok.Model):
+ def __init__(self, name):
+ self.name = name
+
def getMammoth(self, name):
return Mammoth(name)
@@ -51,6 +56,7 @@
<html>
<body>
<h1>Hello, <span tal:replace="context/name/title" />!</h1>
+<p><span tal:replace="context/name/title" /> is part of <span tal:replace="context/__parent__/name" />.</p>
</body>
</html>
""")
Modified: Sandbox/ulif/grok-adminui/src/grok/ftests/traversal/traverser.py
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/ftests/traversal/traverser.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/src/grok/ftests/traversal/traverser.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -5,7 +5,7 @@
>>> import grok
>>> from grok.ftests.traversal.traverser import Herd
>>> grok.grok('grok.ftests.traversal.traverser')
- >>> getRootFolder()["herd"] = Herd()
+ >>> getRootFolder()["herd"] = Herd('The Big Mammoth Herd')
>>> from zope.testbrowser.testing import Browser
>>> browser = Browser()
@@ -15,6 +15,7 @@
<html>
<body>
<h1>Hello, Manfred!</h1>
+ <p>Manfred is part of The Big Mammoth Herd.</p>
</body>
</html>
@@ -23,6 +24,7 @@
<html>
<body>
<h1>Hello, Ellie!</h1>
+ <p>Ellie is part of The Big Mammoth Herd.</p>
</body>
</html>
@@ -30,8 +32,10 @@
import grok
class Herd(grok.Model):
- pass
+ def __init__(self, name):
+ self.name = name
+
class HerdTraverser(grok.Traverser):
grok.context(Herd)
@@ -52,6 +56,7 @@
<html>
<body>
<h1>Hello, <span tal:replace="context/name/title" />!</h1>
+<p><span tal:replace="context/name/title" /> is part of <span tal:replace="context/__parent__/name" />.</p>
</body>
</html>
""")
Copied: Sandbox/ulif/grok-adminui/src/grok/ftests/traversal/traverser_sets_parent.py (from rev 78049, grok/trunk/src/grok/ftests/traversal/traverser_sets_parent.py)
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/ftests/traversal/traverser_sets_parent.py (rev 0)
+++ Sandbox/ulif/grok-adminui/src/grok/ftests/traversal/traverser_sets_parent.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -0,0 +1,66 @@
+"""
+A traverser can set the __parent__ (and __name__) attributes itself,
+in which case Grok's traverser won't interfere:
+
+ >>> import grok
+ >>> from grok.ftests.traversal.traverser_sets_parent import Herd
+ >>> grok.grok('grok.ftests.traversal.traverser_sets_parent')
+ >>> getRootFolder()["herd"] = Herd('The Big Mammoth Herd')
+
+ >>> from zope.testbrowser.testing import Browser
+ >>> browser = Browser()
+ >>> browser.handleErrors = False
+ >>> browser.open("http://localhost/herd/manfred")
+ >>> print browser.contents
+ <html>
+ <body>
+ <h1>Hello, Manfred!</h1>
+ <p>Manfred is part of The Three Stooges.</p>
+ </body>
+ </html>
+
+ >>> browser.open("http://localhost/herd/ellie")
+ >>> print browser.contents
+ <html>
+ <body>
+ <h1>Hello, Ellie!</h1>
+ <p>Ellie is part of The Three Stooges.</p>
+ </body>
+ </html>
+
+"""
+import grok
+
+class Herd(grok.Model):
+
+ def __init__(self, name):
+ self.name = name
+
+class HerdTraverser(grok.Traverser):
+ grok.context(Herd)
+
+ def traverse(self, name):
+ mammoth = Mammoth(name)
+ # We pretend the mammoth is the child object of some competely
+ # differnt Herd object.
+ mammoth.__parent__ = Herd('The Three Stooges')
+ return mammoth
+
+class Mammoth(grok.Model):
+
+ def __init__(self, name):
+ self.name = name
+
+grok.context(Mammoth)
+
+class Index(grok.View):
+ pass
+
+index = grok.PageTemplate("""\
+<html>
+<body>
+<h1>Hello, <span tal:replace="context/name/title" />!</h1>
+<p><span tal:replace="context/name/title" /> is part of <span tal:replace="context/__parent__/name" />.</p>
+</body>
+</html>
+""")
Modified: Sandbox/ulif/grok-adminui/src/grok/meta.py
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/meta.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/src/grok/meta.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,3 +1,18 @@
+##############################################################################
+#
+# Copyright (c) 2006-2007 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Grokkers for the various components."""
+
import os
import zope.component.interface
@@ -30,6 +45,7 @@
from grok import components, formlib
from grok.util import check_adapts, get_default_permission, make_checker
+
class ModelGrokker(martian.ClassGrokker):
component_class = grok.Model
@@ -38,6 +54,7 @@
setattr(factory, field.__name__, field.default)
return True
+
class ContainerGrokker(ModelGrokker):
component_class = grok.Container
@@ -60,6 +77,7 @@
name=name)
return True
+
class MultiAdapterGrokker(martian.ClassGrokker):
component_class = grok.MultiAdapter
@@ -72,6 +90,7 @@
component.provideAdapter(factory, provides=provides, name=name)
return True
+
class GlobalUtilityGrokker(martian.ClassGrokker):
component_class = grok.GlobalUtility
@@ -83,6 +102,7 @@
component.provideUtility(factory(), provides=provides, name=name)
return True
+
class XMLRPCGrokker(martian.ClassGrokker):
component_class = grok.XMLRPC
@@ -114,6 +134,7 @@
make_checker(factory, method_view, permission)
return True
+
class ViewGrokker(martian.ClassGrokker):
component_class = grok.View
@@ -222,6 +243,7 @@
make_checker(factory, method_view, permission)
return True
+
class TraverserGrokker(martian.ClassGrokker):
component_class = grok.Traverser
@@ -232,6 +254,7 @@
provides=IBrowserPublisher)
return True
+
class ModulePageTemplateGrokker(martian.InstanceGrokker):
# this needs to happen before any other grokkers execute that actually
# use the templates
@@ -244,10 +267,12 @@
instance._annotateGrokInfo(name, module_info.dotted_name)
return True
+
class ModulePageTemplateFileGrokker(ModulePageTemplateGrokker):
priority = 1000
component_class = grok.PageTemplateFile
+
class FilesystemPageTemplateGrokker(martian.GlobalGrokker):
# do this early on, but after ModulePageTemplateGrokker, as
# findFilesystem depends on module-level templates to be
@@ -258,6 +283,7 @@
templates.findFilesystem(module_info)
return True
+
class SubscriberGrokker(martian.GlobalGrokker):
def grok(self, name, module, context, module_info, templates):
@@ -269,6 +295,7 @@
zope.component.interface.provideInterface('', iface)
return True
+
class AdapterDecoratorGrokker(martian.GlobalGrokker):
def grok(self, name, module, context, module_info, templates):
@@ -284,6 +311,7 @@
function, adapts=interfaces, provides=function.__implemented__)
return True
+
class StaticResourcesGrokker(martian.GlobalGrokker):
def grok(self, name, module, context, module_info, templates):
@@ -314,6 +342,7 @@
interface.Interface, name=module_info.dotted_name)
return True
+
class GlobalUtilityDirectiveGrokker(martian.GlobalGrokker):
def grok(self, name, module, context, module_info, templates):
@@ -331,6 +360,7 @@
name=info.name)
return True
+
class SiteGrokker(martian.ClassGrokker):
component_class = grok.Site
priority = 500
@@ -404,6 +434,7 @@
return True
+
def localUtilityRegistrationSubscriber(site, event):
"""A subscriber that fires to set up local utilities.
"""
@@ -421,6 +452,7 @@
# do not register utilities anymore
site.__grok_utilities_installed__ = True
+
def setupUtility(site, utility, provides, name=u'',
name_in_container=None, public=False, setup=None):
"""Set up a utility in a site.
@@ -457,6 +489,7 @@
site_manager.registerUtility(utility, provided=provides,
name=name)
+
class DefinePermissionGrokker(martian.GlobalGrokker):
priority = 1500
@@ -475,6 +508,7 @@
return True
+
class AnnotationGrokker(martian.ClassGrokker):
component_class = grok.Annotation
@@ -512,6 +546,7 @@
component.provideAdapter(getAnnotation)
return True
+
class ApplicationGrokker(martian.ClassGrokker):
component_class = grok.Application
priority = 500
@@ -524,6 +559,7 @@
name))
return True
+
class IndexesGrokker(martian.InstanceGrokker):
component_class = components.IndexesClass
@@ -546,6 +582,7 @@
grok.IObjectAddedEvent))
return True
+
class IndexesSetupSubscriber(object):
def __init__(self, catalog_name, indexes, context, module_info):
self.catalog_name = catalog_name
Modified: Sandbox/ulif/grok-adminui/src/grok/templatereg.py
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/templatereg.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/src/grok/templatereg.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -2,6 +2,7 @@
import os
import grok
+import warnings
class TemplateRegistry(object):
@@ -34,9 +35,13 @@
continue
if not template_file.endswith('.pt'):
- raise GrokError("Unrecognized file '%s' in template directory "
- "'%s'." % (template_file, template_dir),
- module_info.getModule())
+ # Warning when importing files. This should be
+ # allowed because people may be using editors that generate
+ # '.bak' files and such.
+ warnings.warn("File '%s' has an unrecognized extension in "
+ "directory '%s'" %
+ (template_file, template_dir), UserWarning, 2)
+ continue
template_name = template_file[:-3] # cut off .pt
template = grok.PageTemplateFile(template_file, template_dir)
Modified: Sandbox/ulif/grok-adminui/src/grok/tests/view/dirtemplatesonly.py
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/tests/view/dirtemplatesonly.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/src/grok/tests/view/dirtemplatesonly.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,12 +1,22 @@
"""
A template directory may only contain recognized template files:
+ >>> from zope.deprecation.tests import warn
+ >>> import warnings
+ >>> saved_warn = warnings.warn
+ >>> warnings.warn = warn
+
>>> grok.grok(__name__)
- Traceback (most recent call last):
- ...
- GrokError: Unrecognized file 'invalid.txt' in template directory '...dirtemplatesonly_templates'.
+ From tests.py's showwarning():
+ ...: UserWarning: File 'invalid.txt' has an unrecognized extension in directory '...dirtemplatesonly_templates'
+
+ >>> warnings.warn = saved_warn
+
"""
import grok
class Mammoth(grok.Model):
pass
+
+class Index(grok.View):
+ pass
\ No newline at end of file
Modified: Sandbox/ulif/grok-adminui/src/grok/util.py
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/util.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/src/grok/util.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -16,6 +16,7 @@
import urllib
+import zope.location.interfaces
from zope import component
from zope.traversing.browser.interfaces import IAbsoluteURL
from zope.traversing.browser.absoluteurl import _safe as SAFE_URL_CHARACTERS
@@ -84,3 +85,17 @@
return url
return url + '/' + urllib.quote(name.encode('utf-8'),
SAFE_URL_CHARACTERS)
+
+def safely_locate_maybe(obj, parent, name):
+ """Set an object's __parent__ (and __name__) if the object's
+ __parent__ attribute doesn't exist yet or is None.
+
+ If the object provides ILocation, __parent__ and __name__ will be
+ set directly. A location proxy will be returned otherwise.
+ """
+ if getattr(obj, '__parent__', None) is not None:
+ return obj
+ if zope.location.interfaces.ILocation.providedBy(obj):
+ zope.location.locate(obj, parent, name)
+ return obj
+ return zope.location.LocationProxy(obj, parent, name)
Modified: Sandbox/ulif/grok-adminui/src/grok/zcml.py
===================================================================
--- Sandbox/ulif/grok-adminui/src/grok/zcml.py 2007-07-17 03:01:59 UTC (rev 78049)
+++ Sandbox/ulif/grok-adminui/src/grok/zcml.py 2007-07-17 03:08:50 UTC (rev 78050)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) 2006-2007 Zope Corporation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -11,15 +11,16 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Grok ZCML-Directives
-"""
+"""Grok ZCML directives."""
+
from zope import interface
import zope.configuration.fields
+
import grok
+
class IGrokDirective(interface.Interface):
- """Grok a package or module.
- """
+ """Grok a package or module."""
package = zope.configuration.fields.GlobalObject(
title=u"Package",
@@ -27,5 +28,6 @@
required=False,
)
+
def grokDirective(_context, package):
grok.grok(package.__name__)
More information about the Checkins
mailing list