From 83df8b32956ed6044b88daf8fffd63d15b33d4ba Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 13 Jan 2010 15:18:21 +0000 Subject: - Get rid of references to repoze.bfg.router.Router. --- TODO.txt | 2 -- docs/tutorials/zeo/index.rst | 8 +++++--- repoze/bfg/events.py | 4 ++-- repoze/bfg/scripting.py | 15 +++++++-------- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/TODO.txt b/TODO.txt index 2dd4c5789..fba480ab3 100644 --- a/TODO.txt +++ b/TODO.txt @@ -4,8 +4,6 @@ - Named notfound views. -- Get rid of references to repoze.bfg.router.Router. - - Describe what level of Python experience you need to understand the book. diff --git a/docs/tutorials/zeo/index.rst b/docs/tutorials/zeo/index.rst index d9caf7d0a..a84abeb36 100644 --- a/docs/tutorials/zeo/index.rst +++ b/docs/tutorials/zeo/index.rst @@ -171,9 +171,11 @@ Configuration import transaction def app(global_config, **settings): - """ This function returns a repoze.bfg.router.Router object. It - is usually called by the PasteDeploy framework during ``paster - serve``""" + """ This function returns a ``repoze.bfg`` WSGI + application. + + It is usually called by the PasteDeploy framework during + ``paster serve``""" # paster app config callback zodb_uri = settings['zodb_uri'] finder = PersistentApplicationFinder(zodb_uri, appmaker) diff --git a/repoze/bfg/events.py b/repoze/bfg/events.py index 6c64fa2ec..bdccfba9c 100644 --- a/repoze/bfg/events.py +++ b/repoze/bfg/events.py @@ -53,8 +53,8 @@ class WSGIApplicationCreatedEvent(object): """ An instance of this class is emitted as an :term:`event` when the :meth:`repoze.bfg.configuration.Configurator.make_wsgi_app` is called. The instance has an attribute, ``app``, which is an - instance of the :class:`repoze.bfg.router.Router` class that will - handle WSGI requests. This class implements the + instance of the :term:`router` that will handle WSGI requests. + This class implements the :class:`repoze.bfg.interfaces.IWSGIApplicationCreatedEvent` interface.""" implements(IWSGIApplicationCreatedEvent) diff --git a/repoze/bfg/scripting.py b/repoze/bfg/scripting.py index b6f7ed97f..8547eae62 100644 --- a/repoze/bfg/scripting.py +++ b/repoze/bfg/scripting.py @@ -2,14 +2,13 @@ from repoze.bfg.request import Request def get_root(app, request=None): """ Return a tuple composed of ``(root, closer)`` when provided a - :class:`repoze.bfg.router.Router` instance as the ``app`` - argument. The ``root`` returned is the application root object. - The ``closer`` returned is a callable (accepting no arguments) - that should be called when your scripting application is finished - using the root. If ``request`` is not None, it is used as the - request passed to the :mod:`repoze.bfg` application root factory. - A request is constructed and passed to the root factory if - ``request`` is None.""" + :term:`router` instance as the ``app`` argument. The ``root`` + returned is the application root object. The ``closer`` returned + is a callable (accepting no arguments) that should be called when + your scripting application is finished using the root. If + ``request`` is not None, it is used as the request passed to the + :mod:`repoze.bfg` application root factory. A request is + constructed and passed to the root factory if ``request`` is None.""" registry = app.registry if request is None: request = Request.blank('/') -- cgit v1.2.3