Work on Step 3.

6 files changed, 9 insertions, 16 deletions

diff --git a/docs/tutorials/lxmlgraph/step03/myapp/configure.zcml b/docs/tutorials/lxmlgraph/step03/myapp/configure.zcml
index ef340c283..83d83ab61 100644
--- a/docs/tutorials/lxmlgraph/step03/myapp/configure.zcml
+++ b/docs/tutorials/lxmlgraph/step03/myapp/configure.zcml
@@ -5,7 +5,7 @@
 
   <bfg:view
      for=".models.IMyModel"
-     view=".views.zpt_default_view"
+     view=".views.zpt_view"
      />
 
   <bfg:view
diff --git a/docs/tutorials/lxmlgraph/step03/myapp/models.py b/docs/tutorials/lxmlgraph/step03/myapp/models.py
index 3c03de1a9..1d93ccdd0 100644
--- a/docs/tutorials/lxmlgraph/step03/myapp/models.py
+++ b/docs/tutorials/lxmlgraph/step03/myapp/models.py
@@ -1,3 +1,5 @@
+import os
+
 from zope.interface import implements
 from zope.interface import Attribute
 from zope.interface import Interface
@@ -32,10 +34,9 @@ def get_root(environ):
     parser.set_element_class_lookup(parser_lookup)
 
     # Now load the XML file
-    xmlstring = open("myapp/samplemodel.xml").read()
+    here = os.path.join(os.path.dirname(__file__))
+    samplemodel = os.path.join(here, 'samplemodel.xml')
+    xmlstring = open(samplemodel).read()
     root = etree.XML(xmlstring, parser)
 
     return root
-
-
-
diff --git a/docs/tutorials/lxmlgraph/step03/myapp/default.pt b/docs/tutorials/lxmlgraph/step03/myapp/templates/default.pt
index 3cc98ef92..3cc98ef92 100644
--- a/docs/tutorials/lxmlgraph/step03/myapp/default.pt
+++ b/docs/tutorials/lxmlgraph/step03/myapp/templates/default.pt
diff --git a/docs/tutorials/lxmlgraph/step03/myapp/xsltview.xsl b/docs/tutorials/lxmlgraph/step03/myapp/templates/xsltview.xsl
index 4d759b15b..4d759b15b 100644
--- a/docs/tutorials/lxmlgraph/step03/myapp/xsltview.xsl
+++ b/docs/tutorials/lxmlgraph/step03/myapp/templates/xsltview.xsl
diff --git a/docs/tutorials/lxmlgraph/step03/myapp/views.py b/docs/tutorials/lxmlgraph/step03/myapp/views.py
index c77eca8fe..0ac33ba83 100644
--- a/docs/tutorials/lxmlgraph/step03/myapp/views.py
+++ b/docs/tutorials/lxmlgraph/step03/myapp/views.py
@@ -1,10 +1,10 @@
 from repoze.bfg.template import render_template_to_response
 from repoze.bfg.template import render_transform_to_response
 
-def zpt_default_view(context, request):
-    return render_template_to_response("default.pt", 
+def zpt_view(context, request):
+    return render_template_to_response("templates/default.pt", 
                                        name=context.__name__, 
                                        node=context)
 
 def xslt_view(context, request):
-    return render_transform_to_response("xsltview.xsl", context)
+    return render_transform_to_response('templates/xsltview.xsl', context)
diff --git a/docs/tutorials/lxmlgraph/step03/run.py b/docs/tutorials/lxmlgraph/step03/run.py
deleted file mode 100644
index 1eac209dc..000000000
--- a/docs/tutorials/lxmlgraph/step03/run.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from paste import httpserver
-
-from repoze.bfg import make_app
-from myapp.models import get_root
-import myapp
-
-app = make_app(get_root, myapp)
-httpserver.serve(app, host='0.0.0.0', port='5432')