fix wiki tutorial based on changes to zodb paster template

3 files changed, 9 insertions, 14 deletions

diff --git a/docs/tutorials/wiki/src/basiclayout/development.ini b/docs/tutorials/wiki/src/basiclayout/development.ini
index 897a2bde6..e8d642cde 100644
--- a/docs/tutorials/wiki/src/basiclayout/development.ini
+++ b/docs/tutorials/wiki/src/basiclayout/development.ini
@@ -1,8 +1,5 @@
-[DEFAULT]
-debug = true
-
-[app:zodb]
-use = egg:tutorial#app
+[app:tutorial]
+use = egg:tutorial
 reload_templates = true
 debug_authorization = false
 debug_notfound = false
@@ -12,7 +9,7 @@ zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
 pipeline =
     egg:repoze.zodbconn#closer
     egg:repoze.tm#tm
-    zodb
+    tutorial
 
 [server:main]
 use = egg:Paste#http
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py
index c6c694e3d..70543918c 100644
--- a/docs/tutorials/wiki/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki/src/basiclayout/setup.py
@@ -12,6 +12,7 @@ requires = [
     'ZODB3',
     'repoze.zodbconn',
     'repoze.tm',
+    'WebError',
     ]
 
 setup(name='tutorial',
@@ -28,7 +29,7 @@ setup(name='tutorial',
       author='',
       author_email='',
       url='',
-      keywords='web wsgi pylons pyramid bfg',
+      keywords='web pyramid bfg',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
@@ -37,6 +38,6 @@ setup(name='tutorial',
       test_suite="tutorial",
       entry_points = """\
       [paste.app_factory]
-      app = tutorial:app
+      main = tutorial:main
       """
       )
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
index 875e77590..f6cf8b479 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
@@ -1,17 +1,14 @@
 from pyramid.configuration import Configurator
 from repoze.zodbconn.finder import PersistentApplicationFinder
-
 from tutorial.models import appmaker
 
-def app(global_config, **settings):
-    """ This function returns a WSGI application.
-    
-    It is usually called by the PasteDeploy framework during 
-    ``paster serve``.
+def main(global_config, **settings):
+    """ This function returns a Pyramid WSGI application.
     """
     zodb_uri = settings.get('zodb_uri')
     if zodb_uri is None:
         raise ValueError("No 'zodb_uri' in application configuration.")
+
     finder = PersistentApplicationFinder(zodb_uri, appmaker)
     def get_root(request):
         return finder(request.environ)