Merge remote branch 'remotes/upstream/master'

4 files changed, 46 insertions, 20 deletions

diff --git a/docs/tutorials/wiki2/src/views/development.ini b/docs/tutorials/wiki2/src/views/development.ini
index e1d0ab598..23b01a338 100644
--- a/docs/tutorials/wiki2/src/views/development.ini
+++ b/docs/tutorials/wiki2/src/views/development.ini
@@ -5,8 +5,7 @@ debug_authorization = false
 debug_notfound = false
 debug_templates = true
 default_locale_name = en
-db_string = sqlite:///%(here)s/tutorial.db
-db_echo = false
+sqlalchemy.url = sqlite:///%(here)s/tutorial.db
 
 [pipeline:main]
 pipeline =
@@ -18,3 +17,37 @@ pipeline =
 use = egg:Paste#http
 host = 0.0.0.0
 port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, sqlalchemy
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_sqlalchemy]
+level = INFO
+handlers =
+qualname = sqlalchemy.engine
+# "level = INFO" logs SQL queries.
+# "level = DEBUG" logs SQL queries and results.
+# "level = WARN" logs neither.  (Recommended for production systems.)
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/docs/tutorials/wiki2/src/views/tutorial/__init__.py b/docs/tutorials/wiki2/src/views/tutorial/__init__.py
index 9ef923e0b..91c299e24 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/__init__.py
@@ -1,29 +1,24 @@
 from pyramid.configuration import Configurator
-from pyramid.settings import asbool
+from sqlalchemy import engine_from_config
 
 from tutorial.models import initialize_sql
 
 def main(global_config, **settings):
     """ This function returns a WSGI application.
     """
-    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))
+    engine = engine_from_config(settings, 'sqlalchemy.')
+    initialize_sql(engine)
     config = Configurator(settings=settings)
-    config.begin()
     config.add_static_view('static', 'tutorial:static')
     config.add_route('home', '/', view='tutorial.views.view_wiki')
-    config.add_route('view_page', '/:pagename',
+    config.add_route('view_page', '/{pagename}',
                      view='tutorial.views.view_page',
                      view_renderer='tutorial:templates/view.pt')
-    config.add_route('add_page', '/add_page/:pagename',
+    config.add_route('add_page', '/add_page/{pagename}',
                      view='tutorial.views.add_page',
                      view_renderer='tutorial:templates/edit.pt')
-    config.add_route('edit_page', '/:pagename/edit_page',
+    config.add_route('edit_page', '/{pagename}/edit_page',
                      view='tutorial.views.edit_page',
                      view_renderer='tutorial:templates/edit.pt')
-    config.end()
     return config.make_wsgi_app()
 
diff --git a/docs/tutorials/wiki2/src/views/tutorial/models.py b/docs/tutorials/wiki2/src/views/tutorial/models.py
index ec9d2b25c..23b8afab8 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/models.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/models.py
@@ -1,6 +1,5 @@
 import transaction
 
-from sqlalchemy import create_engine
 from sqlalchemy import Column
 from sqlalchemy import Integer
 from sqlalchemy import Text
@@ -27,8 +26,7 @@ class Page(Base):
        self.name = name
        self.data = data
 
-def initialize_sql(db_string, echo=False):
-    engine = create_engine(db_string, echo=echo)
+def initialize_sql(engine):
     DBSession.configure(bind=engine)
     Base.metadata.bind = engine
     Base.metadata.create_all(engine)
diff --git a/docs/tutorials/wiki2/src/views/tutorial/tests.py b/docs/tutorials/wiki2/src/views/tutorial/tests.py
index 40336fca4..435e4b588 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/tests.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/tests.py
@@ -14,9 +14,9 @@ def _initTestingDB():
     return DBSession
 
 def _registerRoutes(config):
-    config.add_route('view_page', ':pagename')
-    config.add_route('edit_page', ':pagename/edit_page')
-    config.add_route('add_page', 'add_page/:pagename')
+    config.add_route('view_page', '{pagename}')
+    config.add_route('edit_page', '{pagename}/edit_page')
+    config.add_route('add_page', 'add_page/{pagename}')
 
 class ViewWikiTests(unittest.TestCase):
     def setUp(self):
@@ -28,7 +28,7 @@ class ViewWikiTests(unittest.TestCase):
         
     def test_it(self):
         from tutorial.views import view_wiki
-        self.config.add_route('view_page', ':pagename')
+        self.config.add_route('view_page', '{pagename}')
         request = testing.DummyRequest()
         response = view_wiki(request)
         self.assertEqual(response.location, 'http://example.com/FrontPage')