Updates.

2 files changed, 10 insertions, 13 deletions

diff --git a/docs/tutorials/bfgwiki/src/views/setup.py b/docs/tutorials/bfgwiki/src/views/setup.py
index 76837aee1..35cf22893 100644
--- a/docs/tutorials/bfgwiki/src/views/setup.py
+++ b/docs/tutorials/bfgwiki/src/views/setup.py
@@ -15,22 +15,20 @@ requires = [
     ]
 
 setup(name='tutorial',
-      version='0.1',
+      version='0.0',
       description='tutorial',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
-        "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
+        "Framework :: BFG",
         "Programming Language :: Python",
         "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
-        "Topic :: Internet :: WWW/HTTP :: WSGI",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
       author='',
       author_email='',
       url='',
-      keywords='web wsgi bfg zope',
+      keywords='web wsgi bfg',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
@@ -42,4 +40,3 @@ setup(name='tutorial',
       app = tutorial.run:app
       """
       )
-
diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/run.py b/docs/tutorials/bfgwiki/src/views/tutorial/run.py
index b963f0aaa..748b13eef 100644
--- a/docs/tutorials/bfgwiki/src/views/tutorial/run.py
+++ b/docs/tutorials/bfgwiki/src/views/tutorial/run.py
@@ -1,19 +1,19 @@
-from repoze.bfg.router import make_app
+from repoze.bfg.configuration import Configurator
 from repoze.zodbconn.finder import PersistentApplicationFinder
 
+from tutorial.models import appmaker
+
 def app(global_config, **settings):
-    """ This function returns a repoze.bfg.router.Router object.
+    """ This function returns a ``repoze.bfg`` WSGI application.
     
     It is usually called by the PasteDeploy framework during ``paster serve``.
     """
-    # paster app config callback
-    import tutorial
-    from tutorial.models import appmaker
     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)
-    return make_app(get_root, tutorial, settings=settings)
+    config = Configurator(root_factory=get_root, settings=settings)
+    config.load_zcml('configure.zcml')
+    return config.make_wsgi_app()