Merge branch 'master' into viewderiver

4 files changed, 41 insertions, 44 deletions

diff --git a/docs/tutorials/wiki/src/views/development.ini b/docs/tutorials/wiki/src/views/development.ini
index a102b721b..6f4c33d93 100644
--- a/docs/tutorials/wiki/src/views/development.ini
+++ b/docs/tutorials/wiki/src/views/development.ini
@@ -4,12 +4,14 @@ reload_templates = true
 debug_authorization = false
 debug_notfound = false
 debug_routematch = false
+debug_templates = true
+default_locale_name = en
 zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [pipeline:main]
 pipeline =
+    egg:WebError#evalerror
     egg:repoze.zodbconn#closer
-    egg:Paste#evalerror
     egg:repoze.tm#tm
     tutorial
 
@@ -17,3 +19,29 @@ pipeline =
 use = egg:Paste#http
 host = 0.0.0.0
 port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[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/wiki/src/views/tutorial/__init__.py b/docs/tutorials/wiki/src/views/tutorial/__init__.py
index cf0d14b2d..91f7c2624 100644
--- a/docs/tutorials/wiki/src/views/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/views/tutorial/__init__.py
@@ -4,9 +4,6 @@ from tutorial.models import appmaker
 
 def main(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:
@@ -16,6 +13,6 @@ def main(global_config, **settings):
     def get_root(request):
         return finder(request.environ)
     config = Configurator(root_factory=get_root, settings=settings)
-    config.load_zcml('configure.zcml')
+    config.add_static_view('static', 'tutorial:static')
+    config.scan('tutorial')
     return config.make_wsgi_app()
-
diff --git a/docs/tutorials/wiki/src/views/tutorial/configure.zcml b/docs/tutorials/wiki/src/views/tutorial/configure.zcml
deleted file mode 100644
index c1b1d6ce8..000000000
--- a/docs/tutorials/wiki/src/views/tutorial/configure.zcml
+++ /dev/null
@@ -1,36 +0,0 @@
-<configure xmlns="http://pylonshq.com/pyramid">
-
-  <!-- this must be included for the view declarations to work -->
-  <include package="pyramid.includes" />
-
-  <static
-    name="static"
-    path="static"
-    />
-
-  <view
-     context=".models.Wiki"
-     view=".views.view_wiki"
-     />
-
-  <view
-     context=".models.Wiki"
-     name="add_page"
-     view=".views.add_page"
-     renderer="templates/edit.pt"
-     />
-
-  <view
-     context=".models.Page"
-     view=".views.view_page"
-     renderer="templates/view.pt"
-     />
-
-  <view
-     context=".models.Page"
-     name="edit_page"
-     view=".views.edit_page"
-     renderer="templates/edit.pt"
-     />
-
-</configure>
diff --git a/docs/tutorials/wiki/src/views/tutorial/views.py b/docs/tutorials/wiki/src/views/tutorial/views.py
index 8437fdc51..c96bc2e9c 100644
--- a/docs/tutorials/wiki/src/views/tutorial/views.py
+++ b/docs/tutorials/wiki/src/views/tutorial/views.py
@@ -3,15 +3,19 @@ import re
 
 from pyramid.httpexceptions import HTTPFound
 from pyramid.url import resource_url
+from pyramid.view import view_config
 
 from tutorial.models import Page
 
 # regular expression used to find WikiWords
 wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 
+@view_config(context='tutorial.models.Wiki')
 def view_wiki(context, request):
     return HTTPFound(location = resource_url(context, request, 'FrontPage'))
 
+@view_config(context='tutorial.models.Page',
+             renderer='tutorial:templates/view.pt')
 def view_page(context, request):
     wiki = context.__parent__
 
@@ -29,7 +33,9 @@ def view_page(context, request):
     content = wikiwords.sub(check, content)
     edit_url = resource_url(context, request, 'edit_page')
     return dict(page = context, content = content, edit_url = edit_url)
-    
+
+@view_config(name='add_page', context='tutorial.models.Wiki',
+             renderer='tutorial:templates/edit.pt')
 def add_page(context, request):
     name = request.subpath[0]
     if 'form.submitted' in request.params:
@@ -44,7 +50,9 @@ def add_page(context, request):
     page.__name__ = name
     page.__parent__ = context
     return dict(page = page, save_url = save_url)
-    
+
+@view_config(name='edit_page', context='tutorial.models.Page',
+             renderer='tutorial:templates/edit.pt')
 def edit_page(context, request):
     if 'form.submitted' in request.params:
         context.data = request.params['body']