Move to renderers.

6 files changed, 14 insertions, 36 deletions

diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml
index 285184c38..75e12c9c8 100644
--- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml
@@ -9,6 +9,7 @@
   <route path=""
     name="home"
     view=".views.my_view"
+    renderer="templates/mytemplate.pt"
     />
 
   <static
diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/tests.py b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/tests.py
index 8d163ad20..17083656f 100644
--- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/tests.py
+++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/tests.py
@@ -8,21 +8,14 @@ def _initTestingDB():
 
 class TestMyView(unittest.TestCase):
     def setUp(self):
-        testing.cleanUp()
         _initTestingDB()
         
-    def tearDown(self):
-        testing.cleanUp()
-
-    def _callFUT(self, context, request):
+    def _callFUT(self, request):
         from tutorial.views import my_view
-        return my_view(context, request)
+        return my_view(request)
 
     def test_it(self):
         request = testing.DummyRequest()
-        context = testing.DummyModel()
-        renderer = testing.registerDummyRenderer('templates/mytemplate.pt')
-        response = self._callFUT(context, request)
-        self.assertEqual(renderer.root.name, 'root')
-        self.assertEqual(renderer.request, request)
-        self.assertEqual(renderer.project, 'tutorial')
+        info = self._callFUT(request)
+        self.assertEqual(info['root'].name, 'root')
+        self.assertEqual(info['project'], 'tutorial')
diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/views.py b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/views.py
index a98712ad5..dfb628269 100644
--- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/views.py
+++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/views.py
@@ -1,12 +1,7 @@
-from repoze.bfg.chameleon_zpt import render_template_to_response
-
 from tutorial.models import DBSession
 from tutorial.models import Model
 
 def my_view(request):
     dbsession = DBSession()
     root = dbsession.query(Model).filter(Model.name==u'root').first()
-    return render_template_to_response('templates/mytemplate.pt',
-                                       root = root,
-                                       request = request,
-                                       project = 'tutorial')
+    return {'root':root, 'project':'tutorial'}
diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml
index 285184c38..75e12c9c8 100644
--- a/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml
@@ -9,6 +9,7 @@
   <route path=""
     name="home"
     view=".views.my_view"
+    renderer="templates/mytemplate.pt"
     />
 
   <static
diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/tests.py b/docs/tutorials/bfgwiki2/src/models/tutorial/tests.py
index 8d163ad20..17083656f 100644
--- a/docs/tutorials/bfgwiki2/src/models/tutorial/tests.py
+++ b/docs/tutorials/bfgwiki2/src/models/tutorial/tests.py
@@ -8,21 +8,14 @@ def _initTestingDB():
 
 class TestMyView(unittest.TestCase):
     def setUp(self):
-        testing.cleanUp()
         _initTestingDB()
         
-    def tearDown(self):
-        testing.cleanUp()
-
-    def _callFUT(self, context, request):
+    def _callFUT(self, request):
         from tutorial.views import my_view
-        return my_view(context, request)
+        return my_view(request)
 
     def test_it(self):
         request = testing.DummyRequest()
-        context = testing.DummyModel()
-        renderer = testing.registerDummyRenderer('templates/mytemplate.pt')
-        response = self._callFUT(context, request)
-        self.assertEqual(renderer.root.name, 'root')
-        self.assertEqual(renderer.request, request)
-        self.assertEqual(renderer.project, 'tutorial')
+        info = self._callFUT(request)
+        self.assertEqual(info['root'].name, 'root')
+        self.assertEqual(info['project'], 'tutorial')
diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/views.py b/docs/tutorials/bfgwiki2/src/models/tutorial/views.py
index a98712ad5..dfb628269 100644
--- a/docs/tutorials/bfgwiki2/src/models/tutorial/views.py
+++ b/docs/tutorials/bfgwiki2/src/models/tutorial/views.py
@@ -1,12 +1,7 @@
-from repoze.bfg.chameleon_zpt import render_template_to_response
-
 from tutorial.models import DBSession
 from tutorial.models import Model
 
 def my_view(request):
     dbsession = DBSession()
     root = dbsession.query(Model).filter(Model.name==u'root').first()
-    return render_template_to_response('templates/mytemplate.pt',
-                                       root = root,
-                                       request = request,
-                                       project = 'tutorial')
+    return {'root':root, 'project':'tutorial'}