summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2008-07-08 12:53:40 +0000
committerChris McDonough <chrism@agendaless.com>2008-07-08 12:53:40 +0000
commit41aeaa3c4c22380f076c1989cfd1b52600751286 (patch)
treed253730d5a97606a90ea31aae2c48be45151dfe8
parenta6233800b3acbe90166a22f88a0893212ebde45e (diff)
downloadpyramid-41aeaa3c4c22380f076c1989cfd1b52600751286.tar.gz
pyramid-41aeaa3c4c22380f076c1989cfd1b52600751286.tar.bz2
pyramid-41aeaa3c4c22380f076c1989cfd1b52600751286.zip
Call it TemplateView.
-rw-r--r--repoze/bfg/sampleapp/app.py12
-rw-r--r--repoze/bfg/sampleapp/www/blog_view.pt6
-rw-r--r--repoze/bfg/template.py2
-rw-r--r--repoze/bfg/tests/test_template.py6
4 files changed, 15 insertions, 11 deletions
diff --git a/repoze/bfg/sampleapp/app.py b/repoze/bfg/sampleapp/app.py
index 9a746d1f1..777feb5ca 100644
--- a/repoze/bfg/sampleapp/app.py
+++ b/repoze/bfg/sampleapp/app.py
@@ -1,18 +1,22 @@
-from repoze.bfg.template import BrowserView
+from repoze.bfg.template import TemplateView
from webob import Response
-class BlogDefaultView(BrowserView):
+class BlogDefaultView(TemplateView):
def getInfo(self):
return {'greeting':'Hello, I\'m the default view',
'id':self.context.id}
-class BlogWooHooView(BrowserView):
+class BlogWooHooView(TemplateView):
def getInfo(self):
return {'greeting':'Woo hoo, I\'m another view' ,
'id':self.context.id}
-class DefaultView(BrowserView):
+class DefaultView(object):
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
+
def __call__(self):
return Response('Default page, context is %s' % self.context)
diff --git a/repoze/bfg/sampleapp/www/blog_view.pt b/repoze/bfg/sampleapp/www/blog_view.pt
index e936e0a3d..ceedf0cc1 100644
--- a/repoze/bfg/sampleapp/www/blog_view.pt
+++ b/repoze/bfg/sampleapp/www/blog_view.pt
@@ -1,7 +1,7 @@
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:tal="http://xml.zope.org/namespaces/tal">
- <div tal:define="info view.getInfo()">
- <span tal:content="info.greeting"/> from
- <span tal:content="info.id"/>
+ <div tal:define="info path: view/getInfo">
+ <span tal:content="path: info/greeting"/> from
+ <span tal:content="path: info/id"/>
</div>
</div>
diff --git a/repoze/bfg/template.py b/repoze/bfg/template.py
index eb1dda816..e4606938f 100644
--- a/repoze/bfg/template.py
+++ b/repoze/bfg/template.py
@@ -26,7 +26,7 @@ class ViewPageTemplateFile(property):
options=kwargs)
return template
-class BrowserView(object):
+class TemplateView(object):
classProvides(IViewFactory)
implements(IView)
diff --git a/repoze/bfg/tests/test_template.py b/repoze/bfg/tests/test_template.py
index 67f4e3c47..e726afedc 100644
--- a/repoze/bfg/tests/test_template.py
+++ b/repoze/bfg/tests/test_template.py
@@ -77,7 +77,7 @@ class ViewPageTemplateFileTests(unittest.TestCase, Base):
self.assertEqual(result.status, '200 OK')
self.assertEqual(len(result.headerlist), 2)
-class BrowserViewTests(unittest.TestCase, Base):
+class TemplateViewTests(unittest.TestCase, Base):
def setUp(self):
Base.setUp(self)
@@ -85,8 +85,8 @@ class BrowserViewTests(unittest.TestCase, Base):
Base.tearDown(self)
def _getTargetClass(self):
- from repoze.bfg.template import BrowserView
- return BrowserView
+ from repoze.bfg.template import TemplateView
+ return TemplateView
def _makeOne(self, *arg, **kw):
klass = self._getTargetClass()