[Checkins] SVN: grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ ongoing fixing of removed render support
Reinout van Rees
reinout at vanrees.org
Fri Jul 3 09:53:06 EDT 2009
Log message for revision 101441:
ongoing fixing of removed render support
Changed:
U grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/url/redirect.py
U grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/url/url.py
U grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/url/url_function.py
U grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/argument.py
U grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/macros.py
U grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/require.py
U grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/skindirective.py
U grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/norenderinview.py
U grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/templatenotfound.py
U grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/view.py
U grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/view_decorator.py
-=-
Modified: grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/url/redirect.py
===================================================================
--- grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/url/redirect.py 2009-07-03 13:38:53 UTC (rev 101440)
+++ grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/url/redirect.py 2009-07-03 13:53:06 UTC (rev 101441)
@@ -12,18 +12,18 @@
>>> browser.open('http://localhost/manfred')
>>> browser.url
'http://localhost/manfred/another'
-
+
"""
import grokcore.view as grok
class Mammoth(grok.Context):
pass
-class Index(grok.View):
+class Index(grok.CodeView):
def render(self):
self.redirect(self.url('another'))
-class Another(grok.View):
+class Another(grok.CodeView):
def render(self):
return "Another view"
Modified: grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/url/url.py
===================================================================
--- grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/url/url.py 2009-07-03 13:38:53 UTC (rev 101440)
+++ grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/url/url.py 2009-07-03 13:53:06 UTC (rev 101441)
@@ -180,18 +180,18 @@
grok.context(Mammoth)
-class Index(grok.View):
+class Index(grok.CodeView):
def render(self):
return self.url()
-class Another(grok.View):
+class Another(grok.CodeView):
def render(self):
return self.url()
class YetAnother(grok.View):
pass
-class Multiplier(grok.View):
+class Multiplier(grok.CodeView):
def update(self, age=0):
self.age = age
Modified: grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/url/url_function.py
===================================================================
--- grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/url/url_function.py 2009-07-03 13:38:53 UTC (rev 101440)
+++ grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/url/url_function.py 2009-07-03 13:53:06 UTC (rev 101441)
@@ -61,20 +61,26 @@
>>> expected = unicode('http://127.0.0.1/herd/árgh', 'UTF-8')
>>> urllib.unquote(u).decode('utf-8') == expected
True
+
"""
import grokcore.view as grok
from grokcore.view import url
from zope.app.container.contained import Contained
+
class Mammoth(Contained):
pass
grok.context(Mammoth)
-class Index(grok.View):
+
+class Index(grok.CodeView):
def render(self):
return url(self.request, self)
+
class Another(grok.View):
- def render(self):
- return url(self.request, self)
+ pass
+
+
+another = grok.PageTemplate('<p tal:replace="view/url" />')
Modified: grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/argument.py
===================================================================
--- grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/argument.py 2009-07-03 13:38:53 UTC (rev 101440)
+++ grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/argument.py 2009-07-03 13:53:06 UTC (rev 101441)
@@ -49,15 +49,18 @@
"""
import grokcore.view as grok
+
class Mammoth(grok.Context):
pass
-class RenderWithArguments(grok.View):
+
+class RenderWithArguments(grok.CodeView):
grok.name('render')
def render(self, message, another):
return "Message: %s\nAnother: %s" % (message, another)
+
class UpdateWithArguments(grok.View):
grok.name('update')
grok.template('update')
@@ -66,6 +69,7 @@
self.message = message
self.another = another
+
update = grok.PageTemplate("""
Coming to us from update():
Message: <span tal:replace="view/message" />
Modified: grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/macros.py
===================================================================
--- grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/macros.py 2009-07-03 13:38:53 UTC (rev 101440)
+++ grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/macros.py 2009-07-03 13:53:06 UTC (rev 101441)
@@ -71,26 +71,36 @@
>>> open(template_file, 'w').write(before)
-
"""
import grokcore.view as grok
+
class Mammoth(grok.Context):
pass
-class DancingHall(grok.View):
+class DancingHall(grok.CodeView):
+
def render(self):
return "A nice large dancing hall for mammoths."
+
class Grilled(grok.View):
def update(self):
self.spices = "Pepper and salt"
+
+grilled = grok.PageTemplate("""\
+<html metal:define-macro="spices">
+Curry
+</html>""")
+
+
class Painting(grok.View):
pass
+
painting = grok.PageTemplate("""\
<html metal:use-macro="context/@@layout/macros/main">
<div metal:fill-slot="slot">
@@ -99,38 +109,40 @@
</html>
""")
+
class Layout(grok.View):
# Layout template is in macros_templates/layout.pt for reload test
# purposes.
pass
+
class Dancing(grok.View):
pass
+
dancing = grok.PageTemplate("""\
<html metal:use-macro="context/@@dancinghall/macros/something">
</html>
""")
+
class GrillDish(grok.View):
pass
+
grilldish = grok.PageTemplate("""
<html metal:use-macro="context/@@grilled/macros/spices">
</html>""")
+
+
class Burnt(grok.View):
pass
+
burnt = grok.PageTemplate("""\
<html metal:use-macro="context/@@grilled/spices">
</html>""")
-class Grilled(grok.View):
- pass
-grilled = grok.PageTemplate("""\
-<html metal:define-macro="spices">
-Curry
-</html>""")
Modified: grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/require.py
===================================================================
--- grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/require.py 2009-07-03 13:38:53 UTC (rev 101440)
+++ grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/require.py 2009-07-03 13:53:06 UTC (rev 101441)
@@ -27,17 +27,20 @@
import grokcore.view as grok
import zope.interface
+
class ViewPainting(grok.Permission):
grok.name('cave.ViewPainting')
-class Painting(grok.View):
+
+class Painting(grok.CodeView):
grok.context(zope.interface.Interface)
grok.require(ViewPainting)
def render(self):
return 'What a beautiful painting.'
-class PublicNudity(grok.View):
+
+class PublicNudity(grok.CodeView):
grok.context(zope.interface.Interface)
grok.require(grok.Public)
Modified: grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/skindirective.py
===================================================================
--- grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/skindirective.py 2009-07-03 13:38:53 UTC (rev 101440)
+++ grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/ftests/view/skindirective.py 2009-07-03 13:53:06 UTC (rev 101441)
@@ -47,14 +47,14 @@
</html>
""")
-class MoreDrawings(grok.View):
+class MoreDrawings(grok.CodeView):
grok.layer(rotterdam)
def render(self):
return "Pretty"
-class EvenMoreDrawings(grok.View):
+class EvenMoreDrawings(grok.CodeView):
grok.layer(MySkinLayer)
def render(self):
Modified: grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/norenderinview.py
===================================================================
--- grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/norenderinview.py 2009-07-03 13:38:53 UTC (rev 101440)
+++ grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/norenderinview.py 2009-07-03 13:53:06 UTC (rev 101441)
@@ -5,7 +5,7 @@
>>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
- GrokError: View Class '<class 'grokcore.view.tests.view.eithertemplateorrender.CavePainting'>' has a render method
+ GrokError: View Class '<class 'grokcore.view.tests.view.norenderinview.CavePainting'>' has a render method
"""
import grokcore.view as grok
Modified: grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/templatenotfound.py
===================================================================
--- grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/templatenotfound.py 2009-07-03 13:38:53 UTC (rev 101440)
+++ grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/templatenotfound.py 2009-07-03 13:53:06 UTC (rev 101441)
@@ -2,13 +2,15 @@
This should fail because ``grok.template`` points to a non-existing
template:
- >>> grok.testing.grok(__name__)
- Traceback (most recent call last):
+ >>> grok.testing.grok(__name__)
+ Traceback (most recent call last):
...
- ConfigurationExecutionError: martian.error.GrokError: View <class 'grokcore.view.tests.view.templatenotfound.Painting'>
- has no associated template or 'render' method.
- in:
+ ConfigurationExecutionError: <class 'martian.error.GrokError'>: View <class 'grokcore.view.tests.view.templatenotfound.Painting'> has no associated template.
+ in:
+
+
"""
+
import grokcore.view as grok
class Mammoth(grok.Context):
Modified: grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/view.py
===================================================================
--- grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/view.py 2009-07-03 13:38:53 UTC (rev 101440)
+++ grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/view.py 2009-07-03 13:53:06 UTC (rev 101441)
@@ -37,12 +37,12 @@
class Mammoth(grok.Context):
pass
-class CavePainting(grok.View):
+class CavePainting(grok.CodeView):
def render(self):
return 'A cave painting of a mammoth'
-class Food(grok.View):
+class Food(grok.CodeView):
"""Grok says: ME NO SEE MAMMOTH, ME SEE MEAL!"""
grok.name('meal')
Modified: grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/view_decorator.py
===================================================================
--- grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/view_decorator.py 2009-07-03 13:38:53 UTC (rev 101440)
+++ grokcore.view/branches/reinout-christian-codeview/src/grokcore/view/tests/view/view_decorator.py 2009-07-03 13:53:06 UTC (rev 101441)
@@ -12,10 +12,12 @@
import grokcore.view as grok
import zope.interface
+
class Bogus(grok.Permission):
grok.name('bogus.perm')
-class BogusView(grok.View):
+
+class BogusView(grok.CodeView):
grok.context(zope.interface.Interface)
@grok.require(Bogus)
More information about the Checkins
mailing list