fix wiki tutorial based on changes to zodb paster template

16 files changed, 48 insertions, 61 deletions

diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index 85cfc825b..c05a53831 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -30,32 +30,32 @@ entry point happens to be the ``app`` function within the file named
       :linenos:
       :language: py
 
-#. *Lines 1-2*.  Perform some dependency imports.
+#. *Lines 1-3*.  Perform some dependency imports.
 
-#. *Line 12*. Get the ZODB configuration from the ``development.ini``
+#. *Line 8*. Get the ZODB configuration from the ``development.ini``
    file's ``[app:main]`` section represented by the ``settings``
    dictionary passed to our ``app`` function.  This will be a URI
    (something like ``file:///path/to/Data.fs``).
 
-#. *Line 15*. We create a "finder" object using the
+#. *Line 12*. We create a "finder" object using the
    ``PersistentApplicationFinder`` helper class, passing it the ZODB
    URI and the "appmaker" we've imported from ``models.py``.
 
-#. *Lines 16 - 17*.  We create a :term:`root factory` which uses the
+#. *Lines 13 - 14*.  We create a :term:`root factory` which uses the
    finder to return a ZODB root object.
 
-#. *Line 18*.  We construct a :term:`Configurator` with a :term:`root
+#. *Line 15*.  We construct a :term:`Configurator` with a :term:`root
    factory` and the settings keywords parsed by PasteDeploy.  The root
    factory is named ``get_root``.
 
-#. *Lines 19-21*.  Begin configuration using the ``begin`` method of
+#. *Lines 16-18*.  Begin configuration using the ``begin`` method of
    the :meth:`pyramid.configuration.Configurator` class, load the
    ``configure.zcml`` file from our package using the
    :meth:`pyramid.configuration.Configurator.load_zcml` method, and
    end configuration using the
    :meth:`pyramid.configuration.Configurator.end` method.
 
-#. *Line 22*.  Use the
+#. *Line 19*.  Use the
    :meth:`pyramid.configuration.Configurator.make_wsgi_app` method
    to return a :term:`WSGI` application.
 
diff --git a/docs/tutorials/wiki/src/authorization/development.ini b/docs/tutorials/wiki/src/authorization/development.ini
index 181682585..21f1c048f 100644
--- a/docs/tutorials/wiki/src/authorization/development.ini
+++ b/docs/tutorials/wiki/src/authorization/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
@@ -13,7 +10,7 @@ pipeline =
     egg:repoze.zodbconn#closer
     egg:Paste#evalerror
     egg:repoze.tm#tm
-    zodb
+    tutorial
 
 [server:main]
 use = egg:Paste#http
diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py
index ec8b9b1d5..7e4184312 100644
--- a/docs/tutorials/wiki/src/authorization/setup.py
+++ b/docs/tutorials/wiki/src/authorization/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 pylons pyramid',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
@@ -37,7 +38,7 @@ setup(name='tutorial',
       test_suite="tutorial",
       entry_points = """\
       [paste.app_factory]
-      app = tutorial:app
+      main = tutorial:main
       """
       )
 
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
index 5eef90841..124647ba9 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
@@ -1,9 +1,8 @@
 from pyramid.configuration import Configurator
 from repoze.zodbconn.finder import PersistentApplicationFinder
-
 from tutorial.models import appmaker
 
-def app(global_config, **settings):
+def main(global_config, **settings):
     """ This function returns a WSGI application.
     
     It is usually called by the PasteDeploy framework during 
@@ -12,6 +11,7 @@ def app(global_config, **settings):
     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)
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)
diff --git a/docs/tutorials/wiki/src/models/development.ini b/docs/tutorials/wiki/src/models/development.ini
index 897a2bde6..e8d642cde 100644
--- a/docs/tutorials/wiki/src/models/development.ini
+++ b/docs/tutorials/wiki/src/models/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/models/setup.py b/docs/tutorials/wiki/src/models/setup.py
index c6c694e3d..0ef8f137c 100644
--- a/docs/tutorials/wiki/src/models/setup.py
+++ b/docs/tutorials/wiki/src/models/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 pylons pyramid',
       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/models/tutorial/__init__.py b/docs/tutorials/wiki/src/models/tutorial/__init__.py
index 875e77590..7ef07e767 100644
--- a/docs/tutorials/wiki/src/models/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/models/tutorial/__init__.py
@@ -1,9 +1,8 @@
 from pyramid.configuration import Configurator
 from repoze.zodbconn.finder import PersistentApplicationFinder
-
 from tutorial.models import appmaker
 
-def app(global_config, **settings):
+def main(global_config, **settings):
     """ This function returns a WSGI application.
     
     It is usually called by the PasteDeploy framework during 
@@ -12,6 +11,7 @@ def app(global_config, **settings):
     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)
diff --git a/docs/tutorials/wiki/src/viewdecorators/development.ini b/docs/tutorials/wiki/src/viewdecorators/development.ini
index 181682585..21f1c048f 100644
--- a/docs/tutorials/wiki/src/viewdecorators/development.ini
+++ b/docs/tutorials/wiki/src/viewdecorators/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
@@ -13,7 +10,7 @@ pipeline =
     egg:repoze.zodbconn#closer
     egg:Paste#evalerror
     egg:repoze.tm#tm
-    zodb
+    tutorial
 
 [server:main]
 use = egg:Paste#http
diff --git a/docs/tutorials/wiki/src/viewdecorators/setup.py b/docs/tutorials/wiki/src/viewdecorators/setup.py
index e579c3dae..0ef8f137c 100644
--- a/docs/tutorials/wiki/src/viewdecorators/setup.py
+++ b/docs/tutorials/wiki/src/viewdecorators/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 bfg pylons pyramid',
+      keywords='web pylons pyramid',
       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/viewdecorators/tutorial/__init__.py b/docs/tutorials/wiki/src/viewdecorators/tutorial/__init__.py
index 875e77590..7ef07e767 100644
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/viewdecorators/tutorial/__init__.py
@@ -1,9 +1,8 @@
 from pyramid.configuration import Configurator
 from repoze.zodbconn.finder import PersistentApplicationFinder
-
 from tutorial.models import appmaker
 
-def app(global_config, **settings):
+def main(global_config, **settings):
     """ This function returns a WSGI application.
     
     It is usually called by the PasteDeploy framework during 
@@ -12,6 +11,7 @@ def app(global_config, **settings):
     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)
diff --git a/docs/tutorials/wiki/src/views/development.ini b/docs/tutorials/wiki/src/views/development.ini
index 181682585..21f1c048f 100644
--- a/docs/tutorials/wiki/src/views/development.ini
+++ b/docs/tutorials/wiki/src/views/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
@@ -13,7 +10,7 @@ pipeline =
     egg:repoze.zodbconn#closer
     egg:Paste#evalerror
     egg:repoze.tm#tm
-    zodb
+    tutorial
 
 [server:main]
 use = egg:Paste#http
diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py
index c6c694e3d..0ef8f137c 100644
--- a/docs/tutorials/wiki/src/views/setup.py
+++ b/docs/tutorials/wiki/src/views/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 pylons pyramid',
       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/views/tutorial/__init__.py b/docs/tutorials/wiki/src/views/tutorial/__init__.py
index 875e77590..7ef07e767 100644
--- a/docs/tutorials/wiki/src/views/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/views/tutorial/__init__.py
@@ -1,9 +1,8 @@
 from pyramid.configuration import Configurator
 from repoze.zodbconn.finder import PersistentApplicationFinder
-
 from tutorial.models import appmaker
 
-def app(global_config, **settings):
+def main(global_config, **settings):
     """ This function returns a WSGI application.
     
     It is usually called by the PasteDeploy framework during 
@@ -12,6 +11,7 @@ def app(global_config, **settings):
     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)