Merge branch 'master' of github.com:Pylons/pyramid

2 files changed, 9 insertions, 6 deletions

diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/models.py b/docs/tutorials/wiki2/src/authorization/tutorial/models.py
index 487299c4c..53c6d1122 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/models.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/models.py
@@ -26,16 +26,17 @@ class Page(Base):
     data = Column(Text)
 
     def __init__(self, name, data):
-       self.name = name
-       self.data = data
+        self.name = name
+        self.data = data
 
 def initialize_sql(engine):
     DBSession.configure(bind=engine)
     Base.metadata.bind = engine
     Base.metadata.create_all(engine)
     try:
+        transaction.begin()
         session = DBSession()
-        page = Page('FrontPage', 'initial data')
+        page = Page('FrontPage', 'This is the front page')
         session.add(page)
         transaction.commit()
     except IntegrityError:
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/views.py b/docs/tutorials/wiki2/src/authorization/tutorial/views.py
index 5abd8391e..e0b84971d 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/views.py
@@ -2,7 +2,7 @@ import re
 
 from docutils.core import publish_parts
 
-from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPFound, HTTPNotFound
 from pyramid.security import authenticated_userid
 from pyramid.url import route_url
 
@@ -19,7 +19,9 @@ def view_wiki(request):
 def view_page(request):
     pagename = request.matchdict['pagename']
     session = DBSession()
-    page = session.query(Page).filter_by(name=pagename).one()
+    page = session.query(Page).filter_by(name=pagename).first()
+    if page is None:
+        return HTTPNotFound('No such page')
 
     def check(match):
         word = match.group(1)
@@ -51,7 +53,7 @@ def add_page(request):
     page = Page('', '')
     logged_in = authenticated_userid(request)
     return dict(page=page, save_url=save_url, logged_in=logged_in)
-    
+
 def edit_page(request):
     name = request.matchdict['pagename']
     session = DBSession()