summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/src
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-10-29 13:23:31 -0400
committerChris McDonough <chrism@plope.com>2010-10-29 13:23:31 -0400
commit197f0cb39d0a865476405dda21ad0d3e20ee0789 (patch)
tree061f4595339022831dcd2c31275d0964eed77647 /docs/tutorials/wiki/src
parent66ecc57eb00063edfa01d66f8d6f4495d21d79b5 (diff)
downloadpyramid-197f0cb39d0a865476405dda21ad0d3e20ee0789.tar.gz
pyramid-197f0cb39d0a865476405dda21ad0d3e20ee0789.tar.bz2
pyramid-197f0cb39d0a865476405dda21ad0d3e20ee0789.zip
bfg_view -> view_config
Diffstat (limited to 'docs/tutorials/wiki/src')
-rw-r--r--docs/tutorials/wiki/src/authorization/tutorial/login.py6
-rw-r--r--docs/tutorials/wiki/src/authorization/tutorial/views.py14
-rw-r--r--docs/tutorials/wiki/src/viewdecorators/tutorial/views.py10
3 files changed, 15 insertions, 15 deletions
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/login.py b/docs/tutorials/wiki/src/authorization/tutorial/login.py
index ee67d9a5e..60e69fddf 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/login.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/login.py
@@ -1,6 +1,6 @@
from pyramid.httpexceptions import HTTPFound
-from pyramid.view import bfg_view
+from pyramid.view import view_config
from pyramid.url import model_url
from pyramid.security import remember
@@ -9,7 +9,7 @@ from pyramid.security import forget
from tutorial.models import Wiki
from tutorial.security import USERS
-@bfg_view(context=Wiki, name='login', renderer='templates/login.pt')
+@view_config(context=Wiki, name='login', renderer='templates/login.pt')
def login(request):
login_url = model_url(request.context, request, 'login')
referrer = request.url
@@ -36,7 +36,7 @@ def login(request):
password = password,
)
-@bfg_view(context=Wiki, name='logout')
+@view_config(context=Wiki, name='logout')
def logout(request):
headers = forget(request)
return HTTPFound(location = model_url(request.context, request),
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/views.py b/docs/tutorials/wiki/src/authorization/tutorial/views.py
index 8c35afcd6..48e4e2b43 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/views.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/views.py
@@ -6,7 +6,7 @@ from pyramid.url import model_url
from pyramid.security import authenticated_userid
-from pyramid.view import bfg_view
+from pyramid.view import view_config
from tutorial.models import Page
from tutorial.models import Wiki
@@ -14,11 +14,11 @@ from tutorial.models import Wiki
# regular expression used to find WikiWords
wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
-@bfg_view(context=Wiki, permission='view')
+@view_config(context=Wiki, permission='view')
def view_wiki(context, request):
return HTTPFound(location = model_url(context, request, 'FrontPage'))
-@bfg_view(context=Page, renderer='templates/view.pt', permission='view')
+@view_config(context=Page, renderer='templates/view.pt', permission='view')
def view_page(context, request):
wiki = context.__parent__
@@ -41,8 +41,8 @@ def view_page(context, request):
return dict(page = context, content = content, edit_url = edit_url,
logged_in = logged_in)
-@bfg_view(context=Wiki, name='add_page', renderer='templates/edit.pt',
- permission='edit')
+@view_config(context=Wiki, name='add_page', renderer='templates/edit.pt',
+ permission='edit')
def add_page(context, request):
name = request.subpath[0]
if 'form.submitted' in request.params:
@@ -61,8 +61,8 @@ def add_page(context, request):
return dict(page = page, save_url = save_url, logged_in = logged_in)
-@bfg_view(context=Page, name='edit_page', renderer='templates/edit.pt',
- permission='edit')
+@view_config(context=Page, name='edit_page', renderer='templates/edit.pt',
+ permission='edit')
def edit_page(context, request):
if 'form.submitted' in request.params:
context.data = request.params['body']
diff --git a/docs/tutorials/wiki/src/viewdecorators/tutorial/views.py b/docs/tutorials/wiki/src/viewdecorators/tutorial/views.py
index 937a67344..168965db2 100644
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial/views.py
+++ b/docs/tutorials/wiki/src/viewdecorators/tutorial/views.py
@@ -3,7 +3,7 @@ import re
from pyramid.httpexceptions import HTTPFound
from pyramid.url import model_url
-from pyramid.view import bfg_view
+from pyramid.view import view_config
from tutorial.models import Page
from tutorial.models import Wiki
@@ -11,11 +11,11 @@ from tutorial.models import Wiki
# regular expression used to find WikiWords
wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
-@bfg_view(context=Wiki)
+@view_config(context=Wiki)
def view_wiki(context, request):
return HTTPFound(location = model_url(context, request, 'FrontPage'))
-@bfg_view(context=Page, renderer='templates/view.pt')
+@view_config(context=Page, renderer='templates/view.pt')
def view_page(context, request):
wiki = context.__parent__
@@ -34,7 +34,7 @@ def view_page(context, request):
edit_url = model_url(context, request, 'edit_page')
return dict(page = context, content = content, edit_url = edit_url)
-@bfg_view(context=Wiki, name='add_page', renderer='templates/edit.pt')
+@view_config(context=Wiki, name='add_page', renderer='templates/edit.pt')
def add_page(context, request):
name = request.subpath[0]
if 'form.submitted' in request.params:
@@ -50,7 +50,7 @@ def add_page(context, request):
page.__parent__ = context
return dict(page = page, save_url = save_url)
-@bfg_view(context=Page, name='edit_page', renderer='templates/edit.pt')
+@view_config(context=Page, name='edit_page', renderer='templates/edit.pt')
def edit_page(context, request):
if 'form.submitted' in request.params:
context.data = request.params['body']