summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-10-25 23:09:02 -0400
committerChris McDonough <chrism@plope.com>2010-10-25 23:09:02 -0400
commit2e6905e15221691e645e5ff4ba0378a6d9438c29 (patch)
treeda97f7555bc11dc7369ad12beb1c04c91c713049 /docs/tutorials
parent0d1f2ff01465689a472b10bbded2fa4e7a895569 (diff)
downloadpyramid-2e6905e15221691e645e5ff4ba0378a6d9438c29.tar.gz
pyramid-2e6905e15221691e645e5ff4ba0378a6d9438c29.tar.bz2
pyramid-2e6905e15221691e645e5ff4ba0378a6d9438c29.zip
add httpexceptions docs
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki/definingviews.rst10
-rw-r--r--docs/tutorials/wiki/src/authorization/tutorial/login.py2
-rw-r--r--docs/tutorials/wiki/src/authorization/tutorial/views.py2
-rw-r--r--docs/tutorials/wiki/src/viewdecorators/tutorial/views.py2
-rw-r--r--docs/tutorials/wiki/src/views/tutorial/views.py2
-rw-r--r--docs/tutorials/wiki2/definingviews.rst4
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/login.py3
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/views.py3
-rw-r--r--docs/tutorials/wiki2/src/views/tutorial/views.py3
9 files changed, 14 insertions, 17 deletions
diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index f4d92371a..41a9ad373 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -54,11 +54,11 @@ The ``view_wiki`` view function
The ``view_wiki`` function will be configured to respond as the
default view of a ``Wiki`` model object. It always redirects to the
``Page`` object named "FrontPage". It returns an instance of the
-:class:`webob.exc.HTTPFound` class (instances of which implement the
-WebOb :term:`response` interface), and the
-:func:`pyramid.url.model_url` API.
-:func:`pyramid.url.model_url` constructs a URL to the ``FrontPage``
-page (e.g. ``http://localhost:6543/FrontPage``), and uses it as the
+:class:`pyramid.httpexceptions.HTTPFound` class (instances of which
+implement the WebOb :term:`response` interface), and the
+:func:`pyramid.url.model_url` API. :func:`pyramid.url.model_url`
+constructs a URL to the ``FrontPage`` page
+(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 c029f25ce..ee67d9a5e 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/login.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/login.py
@@ -1,4 +1,4 @@
-from webob.exc import HTTPFound
+from pyramid.httpexceptions import HTTPFound
from pyramid.view import bfg_view
from pyramid.url import model_url
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/views.py b/docs/tutorials/wiki/src/authorization/tutorial/views.py
index f0fef5d81..8c35afcd6 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 webob.exc import HTTPFound
+from pyramid.httpexceptions import HTTPFound
from pyramid.url import model_url
from pyramid.security import authenticated_userid
diff --git a/docs/tutorials/wiki/src/viewdecorators/tutorial/views.py b/docs/tutorials/wiki/src/viewdecorators/tutorial/views.py
index 60cb49faa..937a67344 100644
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial/views.py
+++ b/docs/tutorials/wiki/src/viewdecorators/tutorial/views.py
@@ -1,7 +1,7 @@
from docutils.core import publish_parts
import re
-from webob.exc import HTTPFound
+from pyramid.httpexceptions import HTTPFound
from pyramid.url import model_url
from pyramid.view import bfg_view
diff --git a/docs/tutorials/wiki/src/views/tutorial/views.py b/docs/tutorials/wiki/src/views/tutorial/views.py
index f13ed0381..acc1bbb57 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 webob.exc import HTTPFound
+from pyramid.httpexceptions import HTTPFound
from pyramid.url import model_url
from tutorial.models import Page
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index 1bba7efea..559e6df2f 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -85,8 +85,8 @@ The ``view_wiki`` view function
The ``view_wiki`` function will respond as the :term:`default view` of
a ``Wiki`` model object. It always redirects to a URL which
represents the path to our "FrontPage". It returns an instance of the
-:class:`webob.exc.HTTPFound` class (instances of which implement the
-WebOb :term:`response` interface), It will use the
+:class:`pyramid.httpexceptions.HTTPFound` class (instances of which
+implement the WebOb :term:`response` interface), It will use the
:func:`pyramid.url.route_url` API to construct a URL to the
``FrontPage`` page (e.g. ``http://localhost:6543/FrontPage``), and
will use it as the "location" of the HTTPFound response, forming an
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/login.py b/docs/tutorials/wiki2/src/authorization/tutorial/login.py
index 1a54d575c..7a1d1f663 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/login.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/login.py
@@ -1,5 +1,4 @@
-from webob.exc import HTTPFound
-
+from pyramid.httpexceptions import HTTPFound
from pyramid.security import remember
from pyramid.security import forget
from pyramid.url import route_url
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/views.py b/docs/tutorials/wiki2/src/authorization/tutorial/views.py
index a7e7a57c7..5abd8391e 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/views.py
@@ -2,8 +2,7 @@ import re
from docutils.core import publish_parts
-from webob.exc import HTTPFound
-
+from pyramid.httpexceptions import HTTPFound
from pyramid.security import authenticated_userid
from pyramid.url import route_url
diff --git a/docs/tutorials/wiki2/src/views/tutorial/views.py b/docs/tutorials/wiki2/src/views/tutorial/views.py
index c0d793d38..b8896abe7 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/views.py
@@ -2,8 +2,7 @@ import re
from docutils.core import publish_parts
-from webob.exc import HTTPFound
-
+from pyramid.httpexceptions import HTTPFound
from pyramid.url import route_url
from tutorial.models import DBSession