From a7e625785f65c41e5a6dc017b31bd0d74821474e Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 31 May 2011 14:40:05 -0400
Subject: the canonical import location for HTTP exceptions/responses is now
 pyramid.response

---
 docs/tutorials/wiki/authorization.rst                   | 2 +-
 docs/tutorials/wiki/definingviews.rst                   | 8 ++++----
 docs/tutorials/wiki/src/authorization/tutorial/login.py | 4 ++--
 docs/tutorials/wiki/src/authorization/tutorial/views.py | 2 +-
 docs/tutorials/wiki/src/views/tutorial/views.py         | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'docs/tutorials/wiki')

diff --git a/docs/tutorials/wiki/authorization.rst b/docs/tutorials/wiki/authorization.rst
index e4480d6d9..3b102958e 100644
--- a/docs/tutorials/wiki/authorization.rst
+++ b/docs/tutorials/wiki/authorization.rst
@@ -131,7 +131,7 @@ callable.
 The first view configuration decorator configures the ``login`` view callable
 so it will be invoked when someone visits ``/login`` (when the context is a
 Wiki and the view name is ``login``).  The second decorator (with context of
-``pyramid.exceptions.Forbidden``) specifies a :term:`forbidden view`.  This
+``pyramid.response.HTTPForbidden``) specifies a :term:`forbidden view`.  This
 configures our login view to be presented to the user when :app:`Pyramid`
 detects that a view invocation can not be authorized.  Because we've
 configured a forbidden view, the ``login`` view callable will be invoked
diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index b6c083bbf..ea8842294 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -83,10 +83,10 @@ No renderer is necessary when a view returns a response object.
 
 The ``view_wiki`` view callable always redirects to the URL of a Page
 resource named "FrontPage".  To do so, it returns an instance of the
-:class:`pyramid.httpexceptions.HTTPFound` class (instances of which implement
-the WebOb :term:`response` interface).  The :func:`pyramid.url.resource_url`
-API.  :func:`pyramid.url.resource_url` constructs a URL to the ``FrontPage``
-page resource (e.g. ``http://localhost:6543/FrontPage``), and uses it as the
+:class:`pyramid.response.HTTPFound` class (instances of which implement the
+WebOb :term:`response` interface).  The :func:`pyramid.url.resource_url` API.
+:func:`pyramid.url.resource_url` constructs a URL to the ``FrontPage`` page
+resource (e.g. ``http://localhost:6543/FrontPage``), and uses it as the
 "location" of the HTTPFound response, forming an HTTP redirect.
 
 The ``view_page`` view function
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/login.py b/docs/tutorials/wiki/src/authorization/tutorial/login.py
index 463db71a6..822b19b9e 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/login.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/login.py
@@ -1,4 +1,4 @@
-from pyramid.httpexceptions import HTTPFound
+from pyramid.response import HTTPFound
 
 from pyramid.security import remember
 from pyramid.security import forget
@@ -9,7 +9,7 @@ from tutorial.security import USERS
 
 @view_config(context='tutorial.models.Wiki', name='login',
              renderer='templates/login.pt')
-@view_config(context='pyramid.exceptions.Forbidden',
+@view_config(context='pyramid.response.HTTPForbidden',
              renderer='templates/login.pt')
 def login(request):
     login_url = resource_url(request.context, request, 'login')
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/views.py b/docs/tutorials/wiki/src/authorization/tutorial/views.py
index a83e17de4..67550d58e 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/views.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/views.py
@@ -1,7 +1,7 @@
 from docutils.core import publish_parts
 import re
 
-from pyramid.httpexceptions import HTTPFound
+from pyramid.response import HTTPFound
 from pyramid.url import resource_url
 from pyramid.view import view_config
 from pyramid.security import authenticated_userid
diff --git a/docs/tutorials/wiki/src/views/tutorial/views.py b/docs/tutorials/wiki/src/views/tutorial/views.py
index 42420f2fe..d72cbd3fd 100644
--- a/docs/tutorials/wiki/src/views/tutorial/views.py
+++ b/docs/tutorials/wiki/src/views/tutorial/views.py
@@ -1,7 +1,7 @@
 from docutils.core import publish_parts
 import re
 
-from pyramid.httpexceptions import HTTPFound
+from pyramid.response import HTTPFound
 from pyramid.url import resource_url
 from pyramid.view import view_config
 
-- 
cgit v1.2.3