From 42d31c1c6355a7d6c72393ca668d7d200a994da3 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 14 Aug 2011 14:26:10 -0400 Subject: - All tutorials now use - The ``route_url``, ``route_path``, ``resource_url``, ``static_url``, and ``current_route_url`` methods of the request rather than the function variants imported from ``pyramid.url``. --- docs/tutorials/wiki/src/authorization/tutorial/login.py | 5 ++--- docs/tutorials/wiki/src/authorization/tutorial/tests.py | 8 +++----- docs/tutorials/wiki/src/authorization/tutorial/views.py | 15 +++++++-------- docs/tutorials/wiki/src/tests/tutorial/login.py | 5 ++--- docs/tutorials/wiki/src/tests/tutorial/tests.py | 6 ++---- docs/tutorials/wiki/src/tests/tutorial/views.py | 15 +++++++-------- docs/tutorials/wiki/src/views/tutorial/tests.py | 6 ++---- docs/tutorials/wiki/src/views/tutorial/views.py | 15 +++++++-------- 8 files changed, 32 insertions(+), 43 deletions(-) (limited to 'docs/tutorials/wiki/src') diff --git a/docs/tutorials/wiki/src/authorization/tutorial/login.py b/docs/tutorials/wiki/src/authorization/tutorial/login.py index 334115880..d608a7d0b 100644 --- a/docs/tutorials/wiki/src/authorization/tutorial/login.py +++ b/docs/tutorials/wiki/src/authorization/tutorial/login.py @@ -3,7 +3,6 @@ from pyramid.httpexceptions import HTTPFound from pyramid.security import remember from pyramid.security import forget from pyramid.view import view_config -from pyramid.url import resource_url from tutorial.security import USERS @@ -12,7 +11,7 @@ from tutorial.security import USERS @view_config(context='pyramid.httpexceptions.HTTPForbidden', renderer='templates/login.pt') def login(request): - login_url = resource_url(request.context, request, 'login') + login_url = request.resource_url(request.context, 'login') referrer = request.url if referrer == login_url: referrer = '/' # never use the login form itself as came_from @@ -40,6 +39,6 @@ def login(request): @view_config(context='tutorial.models.Wiki', name='logout') def logout(request): headers = forget(request) - return HTTPFound(location = resource_url(request.context, request), + return HTTPFound(location = request.resource_url(request.context), headers = headers) diff --git a/docs/tutorials/wiki/src/authorization/tutorial/tests.py b/docs/tutorials/wiki/src/authorization/tutorial/tests.py index aaf753816..a4a4e2754 100644 --- a/docs/tutorials/wiki/src/authorization/tutorial/tests.py +++ b/docs/tutorials/wiki/src/authorization/tutorial/tests.py @@ -80,15 +80,14 @@ class AddPageTests(unittest.TestCase): return add_page(context, request) def test_it_notsubmitted(self): - from pyramid.url import resource_url context = testing.DummyResource() request = testing.DummyRequest() request.subpath = ['AnotherPage'] info = self._callFUT(context, request) self.assertEqual(info['page'].data,'') self.assertEqual(info['save_url'], - resource_url( - context, request, 'add_page', 'AnotherPage')) + request.resource_url( + context, 'add_page', 'AnotherPage')) def test_it_submitted(self): context = testing.DummyResource() @@ -107,13 +106,12 @@ class EditPageTests(unittest.TestCase): return edit_page(context, request) def test_it_notsubmitted(self): - from pyramid.url import resource_url context = testing.DummyResource() request = testing.DummyRequest() info = self._callFUT(context, request) self.assertEqual(info['page'], context) self.assertEqual(info['save_url'], - resource_url(context, request, 'edit_page')) + request.resource_url(context, 'edit_page')) def test_it_submitted(self): context = testing.DummyResource() diff --git a/docs/tutorials/wiki/src/authorization/tutorial/views.py b/docs/tutorials/wiki/src/authorization/tutorial/views.py index a83e17de4..a570410ca 100644 --- a/docs/tutorials/wiki/src/authorization/tutorial/views.py +++ b/docs/tutorials/wiki/src/authorization/tutorial/views.py @@ -2,7 +2,6 @@ from docutils.core import publish_parts import re from pyramid.httpexceptions import HTTPFound -from pyramid.url import resource_url from pyramid.view import view_config from pyramid.security import authenticated_userid @@ -13,7 +12,7 @@ wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)") @view_config(context='tutorial.models.Wiki', permission='view') def view_wiki(context, request): - return HTTPFound(location=resource_url(context, request, 'FrontPage')) + return HTTPFound(location=request.resource_url(context, 'FrontPage')) @view_config(context='tutorial.models.Page', renderer='templates/view.pt', permission='view') @@ -24,7 +23,7 @@ def view_page(context, request): word = match.group(1) if word in wiki: page = wiki[word] - view_url = resource_url(page, request) + view_url = request.resource_url(page) return '%s' % (view_url, word) else: add_url = request.application_url + '/add_page/' + word @@ -32,7 +31,7 @@ def view_page(context, request): content = publish_parts(context.data, writer_name='html')['html_body'] content = wikiwords.sub(check, content) - edit_url = resource_url(context, request, 'edit_page') + edit_url = request.resource_url(context, 'edit_page') logged_in = authenticated_userid(request) @@ -50,8 +49,8 @@ def add_page(context, request): page.__name__ = name page.__parent__ = context context[name] = page - return HTTPFound(location = resource_url(page, request)) - save_url = resource_url(context, request, 'add_page', name) + return HTTPFound(location = request.resource_url(page)) + save_url = request.resource_url(context, 'add_page', name) page = Page('') page.__name__ = name page.__parent__ = context @@ -66,11 +65,11 @@ def add_page(context, request): def edit_page(context, request): if 'form.submitted' in request.params: context.data = request.params['body'] - return HTTPFound(location = resource_url(context, request)) + return HTTPFound(location = request.resource_url(context)) logged_in = authenticated_userid(request) return dict(page = context, - save_url = resource_url(context, request, 'edit_page'), + save_url = request.resource_url(context, 'edit_page'), logged_in = logged_in) diff --git a/docs/tutorials/wiki/src/tests/tutorial/login.py b/docs/tutorials/wiki/src/tests/tutorial/login.py index 334115880..d608a7d0b 100644 --- a/docs/tutorials/wiki/src/tests/tutorial/login.py +++ b/docs/tutorials/wiki/src/tests/tutorial/login.py @@ -3,7 +3,6 @@ from pyramid.httpexceptions import HTTPFound from pyramid.security import remember from pyramid.security import forget from pyramid.view import view_config -from pyramid.url import resource_url from tutorial.security import USERS @@ -12,7 +11,7 @@ from tutorial.security import USERS @view_config(context='pyramid.httpexceptions.HTTPForbidden', renderer='templates/login.pt') def login(request): - login_url = resource_url(request.context, request, 'login') + login_url = request.resource_url(request.context, 'login') referrer = request.url if referrer == login_url: referrer = '/' # never use the login form itself as came_from @@ -40,6 +39,6 @@ def login(request): @view_config(context='tutorial.models.Wiki', name='logout') def logout(request): headers = forget(request) - return HTTPFound(location = resource_url(request.context, request), + return HTTPFound(location = request.resource_url(request.context), headers = headers) diff --git a/docs/tutorials/wiki/src/tests/tutorial/tests.py b/docs/tutorials/wiki/src/tests/tutorial/tests.py index 6fbf9ce8b..86ddba7b7 100644 --- a/docs/tutorials/wiki/src/tests/tutorial/tests.py +++ b/docs/tutorials/wiki/src/tests/tutorial/tests.py @@ -80,7 +80,6 @@ class AddPageTests(unittest.TestCase): return add_page(context, request) def test_it_notsubmitted(self): - from pyramid.url import resource_url context = testing.DummyResource() request = testing.DummyRequest() request.subpath = ['AnotherPage'] @@ -88,7 +87,7 @@ class AddPageTests(unittest.TestCase): self.assertEqual(info['page'].data,'') self.assertEqual( info['save_url'], - resource_url(context, request, 'add_page', 'AnotherPage')) + request.resource_url(context, 'add_page', 'AnotherPage')) def test_it_submitted(self): context = testing.DummyResource() @@ -107,13 +106,12 @@ class EditPageTests(unittest.TestCase): return edit_page(context, request) def test_it_notsubmitted(self): - from pyramid.url import resource_url context = testing.DummyResource() request = testing.DummyRequest() info = self._callFUT(context, request) self.assertEqual(info['page'], context) self.assertEqual(info['save_url'], - resource_url(context, request, 'edit_page')) + request.resource_url(context, 'edit_page')) def test_it_submitted(self): context = testing.DummyResource() diff --git a/docs/tutorials/wiki/src/tests/tutorial/views.py b/docs/tutorials/wiki/src/tests/tutorial/views.py index a83e17de4..a570410ca 100644 --- a/docs/tutorials/wiki/src/tests/tutorial/views.py +++ b/docs/tutorials/wiki/src/tests/tutorial/views.py @@ -2,7 +2,6 @@ from docutils.core import publish_parts import re from pyramid.httpexceptions import HTTPFound -from pyramid.url import resource_url from pyramid.view import view_config from pyramid.security import authenticated_userid @@ -13,7 +12,7 @@ wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)") @view_config(context='tutorial.models.Wiki', permission='view') def view_wiki(context, request): - return HTTPFound(location=resource_url(context, request, 'FrontPage')) + return HTTPFound(location=request.resource_url(context, 'FrontPage')) @view_config(context='tutorial.models.Page', renderer='templates/view.pt', permission='view') @@ -24,7 +23,7 @@ def view_page(context, request): word = match.group(1) if word in wiki: page = wiki[word] - view_url = resource_url(page, request) + view_url = request.resource_url(page) return '%s' % (view_url, word) else: add_url = request.application_url + '/add_page/' + word @@ -32,7 +31,7 @@ def view_page(context, request): content = publish_parts(context.data, writer_name='html')['html_body'] content = wikiwords.sub(check, content) - edit_url = resource_url(context, request, 'edit_page') + edit_url = request.resource_url(context, 'edit_page') logged_in = authenticated_userid(request) @@ -50,8 +49,8 @@ def add_page(context, request): page.__name__ = name page.__parent__ = context context[name] = page - return HTTPFound(location = resource_url(page, request)) - save_url = resource_url(context, request, 'add_page', name) + return HTTPFound(location = request.resource_url(page)) + save_url = request.resource_url(context, 'add_page', name) page = Page('') page.__name__ = name page.__parent__ = context @@ -66,11 +65,11 @@ def add_page(context, request): def edit_page(context, request): if 'form.submitted' in request.params: context.data = request.params['body'] - return HTTPFound(location = resource_url(context, request)) + return HTTPFound(location = request.resource_url(context)) logged_in = authenticated_userid(request) return dict(page = context, - save_url = resource_url(context, request, 'edit_page'), + save_url = request.resource_url(context, 'edit_page'), logged_in = logged_in) diff --git a/docs/tutorials/wiki/src/views/tutorial/tests.py b/docs/tutorials/wiki/src/views/tutorial/tests.py index 28e424884..9eac2a432 100644 --- a/docs/tutorials/wiki/src/views/tutorial/tests.py +++ b/docs/tutorials/wiki/src/views/tutorial/tests.py @@ -80,7 +80,6 @@ class AddPageTests(unittest.TestCase): return add_page(context, request) def test_it_notsubmitted(self): - from pyramid.url import resource_url context = testing.DummyResource() request = testing.DummyRequest() request.subpath = ['AnotherPage'] @@ -88,7 +87,7 @@ class AddPageTests(unittest.TestCase): self.assertEqual(info['page'].data,'') self.assertEqual( info['save_url'], - resource_url(context, request, 'add_page', 'AnotherPage')) + request.resource_url(context, 'add_page', 'AnotherPage')) def test_it_submitted(self): context = testing.DummyResource() @@ -107,13 +106,12 @@ class EditPageTests(unittest.TestCase): return edit_page(context, request) def test_it_notsubmitted(self): - from pyramid.url import resource_url context = testing.DummyResource() request = testing.DummyRequest() info = self._callFUT(context, request) self.assertEqual(info['page'], context) self.assertEqual(info['save_url'], - resource_url(context, request, 'edit_page')) + request.resource_url(context, 'edit_page')) def test_it_submitted(self): context = testing.DummyResource() diff --git a/docs/tutorials/wiki/src/views/tutorial/views.py b/docs/tutorials/wiki/src/views/tutorial/views.py index 42420f2fe..245cda682 100644 --- a/docs/tutorials/wiki/src/views/tutorial/views.py +++ b/docs/tutorials/wiki/src/views/tutorial/views.py @@ -2,7 +2,6 @@ from docutils.core import publish_parts import re from pyramid.httpexceptions import HTTPFound -from pyramid.url import resource_url from pyramid.view import view_config from tutorial.models import Page @@ -12,7 +11,7 @@ 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')) + return HTTPFound(location=request.resource_url(context, 'FrontPage')) @view_config(context='tutorial.models.Page', renderer='tutorial:templates/view.pt') @@ -23,7 +22,7 @@ def view_page(context, request): word = match.group(1) if word in wiki: page = wiki[word] - view_url = resource_url(page, request) + view_url = request.resource_url(page) return '%s' % (view_url, word) else: add_url = request.application_url + '/add_page/' + word @@ -31,7 +30,7 @@ def view_page(context, request): content = publish_parts(context.data, writer_name='html')['html_body'] content = wikiwords.sub(check, content) - edit_url = resource_url(context, request, 'edit_page') + edit_url = request.resource_url(context, 'edit_page') return dict(page = context, content = content, edit_url = edit_url) @view_config(name='add_page', context='tutorial.models.Wiki', @@ -44,8 +43,8 @@ def add_page(context, request): page.__name__ = name page.__parent__ = context context[name] = page - return HTTPFound(location = resource_url(page, request)) - save_url = resource_url(context, request, 'add_page', name) + return HTTPFound(location = request.resource_url(page)) + save_url = request.resource_url(context, 'add_page', name) page = Page('') page.__name__ = name page.__parent__ = context @@ -56,9 +55,9 @@ def add_page(context, request): def edit_page(context, request): if 'form.submitted' in request.params: context.data = request.params['body'] - return HTTPFound(location = resource_url(context, request)) + return HTTPFound(location = request.resource_url(context)) return dict(page = context, - save_url = resource_url(context, request, 'edit_page')) + save_url = request.resource_url(context, 'edit_page')) -- cgit v1.2.3