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

  ``pyramid_routesalchemy`` paster template.

5 files changed, 23 insertions, 44 deletions

diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini
index 73b5ed9a4..73b5ed9a4 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial.ini
+++ b/docs/tutorials/wiki2/src/basiclayout/development.ini
diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py
index aca548b32..79b1a37c9 100644
--- a/docs/tutorials/wiki2/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki2/src/basiclayout/setup.py
@@ -39,7 +39,7 @@ setup(name='tutorial',
       install_requires = requires,
       entry_points = """\
       [paste.app_factory]
-      app = tutorial.run:app
+      app = tutorial:app
       """
       )
 
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
index cbdfd3ac6..e1ef485f7 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
@@ -1,2 +1,23 @@
-# A package
+from pyramid.configuration import Configurator
+from paste.deploy.converters import asbool
 
+from tutorial.models import initialize_sql
+
+def app(global_config, **settings):
+    """ This function returns a WSGI application.
+    
+    It is usually called by the PasteDeploy framework during 
+    ``paster serve``.
+    """
+    db_string = settings.get('db_string')
+    if db_string is None:
+        raise ValueError("No 'db_string' value in application configuration.")
+    db_echo = settings.get('db_echo', 'false')
+    initialize_sql(db_string, asbool(db_echo))
+    config = Configurator(settings=settings)
+    config.begin()
+    config.add_static_view('static', 'templates/static')
+    config.add_route('home', '/', view='tutorial.views.my_view',
+                     view_renderer='templates/mytemplate.pt')
+    config.end()
+    return config.make_wsgi_app()
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/configure.zcml b/docs/tutorials/wiki2/src/basiclayout/tutorial/configure.zcml
deleted file mode 100644
index 47adfbefb..000000000
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/configure.zcml
+++ /dev/null
@@ -1,18 +0,0 @@
-<configure xmlns="http://pylonshq.com/pyramid">
-
-  <!-- this must be included for the view declarations to work -->
-  <include package="pyramid.includes" />
-
-  <route 
-    pattern=""
-    name="home"
-    view=".views.my_view"
-    view_renderer="templates/mytemplate.pt"
-    />
-
-  <static
-    name="static"
-    path="templates/static"
-    />
-
-</configure>
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/run.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/run.py
deleted file mode 100644
index 7225987ee..000000000
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/run.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from pyramid.configuration import Configurator
-from paste.deploy.converters import asbool
-
-from tutorial.models import initialize_sql
-
-def app(global_config, **settings):
-    """ This function returns a WSGI application.
-    
-    It is usually called by the PasteDeploy framework during 
-    ``paster serve``.
-    """
-    zcml_file = settings.get('configure_zcml', 'configure.zcml')
-    db_string = settings.get('db_string')
-    if db_string is None:
-        raise ValueError(
-            "No 'db_string' value in application configuration.")
-    db_echo = settings.get('db_echo', 'false')
-    initialize_sql(db_string, asbool(db_echo))
-    config = Configurator(settings=settings)
-    config.begin()
-    config.load_zcml(zcml_file)
-    config.end()
-    return config.make_wsgi_app()
-