diff options
| -rw-r--r-- | docs/narr/MyProject/myproject/run.py | 4 | ||||
| -rw-r--r-- | docs/narr/project.rst | 5 | ||||
| -rw-r--r-- | repoze/bfg/paster_templates/starter/+package+/run.py_tmpl | 4 | ||||
| -rw-r--r-- | repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl | 5 |
4 files changed, 7 insertions, 11 deletions
diff --git a/docs/narr/MyProject/myproject/run.py b/docs/narr/MyProject/myproject/run.py index 33d534f2d..cb9296e1f 100644 --- a/docs/narr/MyProject/myproject/run.py +++ b/docs/narr/MyProject/myproject/run.py @@ -1,5 +1,4 @@ from repoze.bfg.router import make_app -from repoze.bfg.registry import get_options def app(global_config, **kw): """ This function returns a repoze.bfg.router.Router object. It @@ -7,5 +6,4 @@ def app(global_config, **kw): serve``""" from myproject.models import get_root import myproject - options = get_options(kw) - return make_app(get_root, myproject, options=options) + return make_app(get_root, myproject, options=kw) diff --git a/docs/narr/project.rst b/docs/narr/project.rst index 799958f7c..89e4e1d9e 100644 --- a/docs/narr/project.rst +++ b/docs/narr/project.rst @@ -582,9 +582,10 @@ without the PasteDeploy configuration file: .. literalinclude:: MyProject/myproject/run.py :linenos: -#. Lines 1 - 2 import functions from :mod:`repoze.bfg` that we use later. +#. Line 1 imports the ``make_app`` functions from + :mod:`repoze.bfg.router` that we use later. -#. Lines 4-12 define a function that returns a :mod:`repoze.bfg` Router +#. Lines 3-9 define a function that returns a :mod:`repoze.bfg` Router application from :ref:`router_module` . This is meant to be called by the :term:`PasteDeploy` framework as a result of running ``paster serve``. diff --git a/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl b/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl index 0f714f7c7..11a137fc2 100644 --- a/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl +++ b/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl @@ -1,5 +1,4 @@ from repoze.bfg.router import make_app -from repoze.bfg.registry import get_options def app(global_config, **kw): """ This function returns a repoze.bfg.router.Router object. It @@ -8,6 +7,5 @@ def app(global_config, **kw): # paster app config callback from {{package}}.models import get_root import {{package}} - options = get_options(kw) - return make_app(get_root, {{package}}, options=options) + return make_app(get_root, {{package}}, options=kw) diff --git a/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl b/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl index 39a9e76b1..4d3b98882 100644 --- a/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl +++ b/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl @@ -1,5 +1,4 @@ -from repoze.bfg.router import make_app as bfg_make_app -from repoze.bfg.registry import get_options +from repoze.bfg.router import make_app from repoze.zodbconn.finder import PersistentApplicationFinder def app(global_config, **kw): @@ -15,4 +14,4 @@ def app(global_config, **kw): raise ValueError("No 'zodb_uri' in application configuration.") get_root = PersistentApplicationFinder(zodb_uri, appmaker) - return bfg_make_app(get_root, {{package}}, options=get_options(kw)) + return make_app(get_root, {{package}}, options=kw) |