- The ZODB Wiki tutorial was updated to take into account changes to the

  ``pyramid_zodb`` paster template.

20 files changed, 114 insertions, 121 deletions

diff --git a/docs/tutorials/wiki/src/authorization/tutorial.ini b/docs/tutorials/wiki/src/authorization/development.ini
index 181682585..181682585 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial.ini
+++ b/docs/tutorials/wiki/src/authorization/development.ini
diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py
index bb2482cce..ec8b9b1d5 100644
--- a/docs/tutorials/wiki/src/authorization/setup.py
+++ b/docs/tutorials/wiki/src/authorization/setup.py
@@ -37,7 +37,7 @@ setup(name='tutorial',
       test_suite="tutorial",
       entry_points = """\
       [paste.app_factory]
-      app = tutorial.run:app
+      app = tutorial:app
       """
       )
 
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
index cbdfd3ac6..5eef90841 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/__init__.py
@@ -1,2 +1,22 @@
-# A package
+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``.
+    """
+    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)
+    config = Configurator(root_factory=get_root, settings=settings)
+    config.begin()
+    config.load_zcml('configure.zcml')
+    config.end()
+    return config.make_wsgi_app()
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/run.py b/docs/tutorials/wiki/src/authorization/tutorial/run.py
deleted file mode 100644
index 875e77590..000000000
--- a/docs/tutorials/wiki/src/authorization/tutorial/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-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``.
-    """
-    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)
-    config = Configurator(root_factory=get_root, settings=settings)
-    config.begin()
-    config.load_zcml('configure.zcml')
-    config.end()
-    return config.make_wsgi_app()
-
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial.ini b/docs/tutorials/wiki/src/basiclayout/development.ini
index 897a2bde6..897a2bde6 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial.ini
+++ b/docs/tutorials/wiki/src/basiclayout/development.ini
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py
index f4a011c7e..c6c694e3d 100644
--- a/docs/tutorials/wiki/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki/src/basiclayout/setup.py
@@ -37,6 +37,6 @@ setup(name='tutorial',
       test_suite="tutorial",
       entry_points = """\
       [paste.app_factory]
-      app = tutorial.run:app
+      app = tutorial:app
       """
       )
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
index cbdfd3ac6..875e77590 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
@@ -1,2 +1,23 @@
-# A package
+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``.
+    """
+    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)
+    config = Configurator(root_factory=get_root, settings=settings)
+    config.begin()
+    config.load_zcml('configure.zcml')
+    config.end()
+    return config.make_wsgi_app()
 
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/run.py b/docs/tutorials/wiki/src/basiclayout/tutorial/run.py
deleted file mode 100644
index 5eef90841..000000000
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/run.py
+++ /dev/null
@@ -1,22 +0,0 @@
-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``.
-    """
-    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)
-    config = Configurator(root_factory=get_root, settings=settings)
-    config.begin()
-    config.load_zcml('configure.zcml')
-    config.end()
-    return config.make_wsgi_app()
diff --git a/docs/tutorials/wiki/src/models/tutorial.ini b/docs/tutorials/wiki/src/models/development.ini
index 897a2bde6..897a2bde6 100644
--- a/docs/tutorials/wiki/src/models/tutorial.ini
+++ b/docs/tutorials/wiki/src/models/development.ini
diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py
index f4a011c7e..c6c694e3d 100644
--- a/docs/tutorials/wiki/src/models/setup.py
+++ b/docs/tutorials/wiki/src/models/setup.py
@@ -37,6 +37,6 @@ setup(name='tutorial',
       test_suite="tutorial",
       entry_points = """\
       [paste.app_factory]
-      app = tutorial.run:app
+      app = tutorial:app
       """
       )
diff --git a/docs/tutorials/wiki/src/models/tutorial/__init__.py b/docs/tutorials/wiki/src/models/tutorial/__init__.py
index cbdfd3ac6..875e77590 100644
--- a/docs/tutorials/wiki/src/models/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/models/tutorial/__init__.py
@@ -1,2 +1,23 @@
-# A package
+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``.
+    """
+    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)
+    config = Configurator(root_factory=get_root, settings=settings)
+    config.begin()
+    config.load_zcml('configure.zcml')
+    config.end()
+    return config.make_wsgi_app()
 
diff --git a/docs/tutorials/wiki/src/models/tutorial/run.py b/docs/tutorials/wiki/src/models/tutorial/run.py
deleted file mode 100644
index 5eef90841..000000000
--- a/docs/tutorials/wiki/src/models/tutorial/run.py
+++ /dev/null
@@ -1,22 +0,0 @@
-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``.
-    """
-    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)
-    config = Configurator(root_factory=get_root, settings=settings)
-    config.begin()
-    config.load_zcml('configure.zcml')
-    config.end()
-    return config.make_wsgi_app()
diff --git a/docs/tutorials/wiki/src/viewdecorators/tutorial.ini b/docs/tutorials/wiki/src/viewdecorators/development.ini
index 181682585..181682585 100644
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial.ini
+++ b/docs/tutorials/wiki/src/viewdecorators/development.ini
diff --git a/docs/tutorials/wiki/src/viewdecorators/setup.py b/docs/tutorials/wiki/src/viewdecorators/setup.py
index 977990a29..e579c3dae 100644
--- a/docs/tutorials/wiki/src/viewdecorators/setup.py
+++ b/docs/tutorials/wiki/src/viewdecorators/setup.py
@@ -37,6 +37,6 @@ setup(name='tutorial',
       test_suite="tutorial",
       entry_points = """\
       [paste.app_factory]
-      app = tutorial.run:app
+      app = tutorial:app
       """
       )
diff --git a/docs/tutorials/wiki/src/viewdecorators/tutorial/__init__.py b/docs/tutorials/wiki/src/viewdecorators/tutorial/__init__.py
index cbdfd3ac6..875e77590 100644
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/viewdecorators/tutorial/__init__.py
@@ -1,2 +1,23 @@
-# A package
+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``.
+    """
+    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)
+    config = Configurator(root_factory=get_root, settings=settings)
+    config.begin()
+    config.load_zcml('configure.zcml')
+    config.end()
+    return config.make_wsgi_app()
 
diff --git a/docs/tutorials/wiki/src/viewdecorators/tutorial/run.py b/docs/tutorials/wiki/src/viewdecorators/tutorial/run.py
deleted file mode 100644
index 5eef90841..000000000
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial/run.py
+++ /dev/null
@@ -1,22 +0,0 @@
-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``.
-    """
-    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)
-    config = Configurator(root_factory=get_root, settings=settings)
-    config.begin()
-    config.load_zcml('configure.zcml')
-    config.end()
-    return config.make_wsgi_app()
diff --git a/docs/tutorials/wiki/src/views/tutorial.ini b/docs/tutorials/wiki/src/views/development.ini
index 181682585..181682585 100644
--- a/docs/tutorials/wiki/src/views/tutorial.ini
+++ b/docs/tutorials/wiki/src/views/development.ini
diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py
index f4a011c7e..c6c694e3d 100644
--- a/docs/tutorials/wiki/src/views/setup.py
+++ b/docs/tutorials/wiki/src/views/setup.py
@@ -37,6 +37,6 @@ setup(name='tutorial',
       test_suite="tutorial",
       entry_points = """\
       [paste.app_factory]
-      app = tutorial.run:app
+      app = tutorial:app
       """
       )
diff --git a/docs/tutorials/wiki/src/views/tutorial/__init__.py b/docs/tutorials/wiki/src/views/tutorial/__init__.py
index cbdfd3ac6..875e77590 100644
--- a/docs/tutorials/wiki/src/views/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/views/tutorial/__init__.py
@@ -1,2 +1,23 @@
-# A package
+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``.
+    """
+    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)
+    config = Configurator(root_factory=get_root, settings=settings)
+    config.begin()
+    config.load_zcml('configure.zcml')
+    config.end()
+    return config.make_wsgi_app()
 
diff --git a/docs/tutorials/wiki/src/views/tutorial/run.py b/docs/tutorials/wiki/src/views/tutorial/run.py
deleted file mode 100644
index 5eef90841..000000000
--- a/docs/tutorials/wiki/src/views/tutorial/run.py
+++ /dev/null
@@ -1,22 +0,0 @@
-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``.
-    """
-    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)
-    config = Configurator(root_factory=get_root, settings=settings)
-    config.begin()
-    config.load_zcml('configure.zcml')
-    config.end()
-    return config.make_wsgi_app()