From 32cb805132e8149a276a8c65fdfa961384e8254e Mon Sep 17 00:00:00 2001
From: John Anderson <sontek@gmail.com>
Date: Thu, 1 Jan 2015 15:03:56 -0800
Subject: Mkae the response factory a factory that takes a request

---
 docs/glossary.rst   |  3 ++-
 docs/narr/hooks.rst | 29 ++++++-----------------------
 2 files changed, 8 insertions(+), 24 deletions(-)

(limited to 'docs')

diff --git a/docs/glossary.rst b/docs/glossary.rst
index 05ff7c114..38133f68f 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -17,7 +17,8 @@ Glossary
      positional argument, returns a Pyramid-compatible request.
 
    response factory
-     An object which returns a Pyramid-compatible response.
+     An object which, provied a :term:`request` as a single positional
+     argument, returns a Pyramid-compatible response.
 
    response
      An object returned by a :term:`view callable` that represents response
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index 689ce9dc2..e250c2d7e 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -369,10 +369,10 @@ Whenever :app:`Pyramid` returns a response from a view it creates a
 :class:`pyramid.response.Response` class is created to represent the response
 object.
 
-The class (aka "factory") that :app:`Pyramid` uses to create a response object
-instance can be changed by passing a ``response_factory`` argument to the
-constructor of the :term:`configurator`.  This argument can be either a
-callable or a :term:`dotted Python name` representing a callable.
+The factory that :app:`Pyramid` uses to create a response object instance can be
+changed by passing a ``response_factory`` argument to the constructor of the
+:term:`configurator`.  This argument can be either a callable or a
+:term:`dotted Python name` representing a callable.
 
 .. code-block:: python
    :linenos:
@@ -382,7 +382,7 @@ callable or a :term:`dotted Python name` representing a callable.
    class MyResponse(Response):
        pass
 
-   config = Configurator(response_factory=MyResponse)
+   config = Configurator(response_factory=lambda r: MyResponse())
 
 If you're doing imperative configuration, and you'd rather do it after you've
 already constructed a :term:`configurator` it can also be registered via the
@@ -398,25 +398,8 @@ already constructed a :term:`configurator` it can also be registered via the
        pass
 
    config = Configurator()
-   config.set_response_factory(MyRequest)
-
-If you are already using a custom ```request_factory`` you can also set the
-``ResponseClass`` on your :class:`pyramid.request.Request`:
-
-.. code-block:: python
-   :linenos:
-
-   from pyramid.config import Configurator
-   from pyramid.response import Response
-   from pyramid.request import Request
-
-   class MyResponse(Response):
-       pass
-
-   class MyRequest(Request):
-       ResponseClass = MyResponse
+   config.set_response_factory(lambda r: MyResponse())
 
-   config = Configurator()
 
 Using The Before Render Event
 -----------------------------
-- 
cgit v1.2.3