From c1bc021263d4ae2299851b809d5c4d0e48399f61 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 10 Nov 2009 05:03:02 +0000 Subject: Templates --------- - Remove ``ez_setup.py`` and its import from all paster templates, samples, and tutorials for ``distribute`` compatibility. The documentation already explains how to install virtualenv (which will include some ``setuptools`` package), so these files, imports and usages were superfluous. Deprecations ------------ - The ``options`` kw arg to the ``repoze.bfg.router.make_app`` function is deprecated. In its place is the keyword argument ``settings``. The ``options`` keyword continues to work, and a deprecation warning is not emitted when it is detected. However, the paster templates, code samples, and documentation now make reference to ``settings`` rather than ``options``. This change/deprecation was mainly made for purposes of clarity and symmetry with the ``get_settings()`` API and dicussions of "settings" in various places in the docs: we want to use the same name to refer to the same thing everywhere. --- docs/tutorials/zeo/index.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/tutorials/zeo') diff --git a/docs/tutorials/zeo/index.rst b/docs/tutorials/zeo/index.rst index 331e13a4d..f96167402 100644 --- a/docs/tutorials/zeo/index.rst +++ b/docs/tutorials/zeo/index.rst @@ -167,17 +167,17 @@ Configuration from myapp.models import MyModel import transaction - def app(global_config, **kw): + 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``""" # paster app config callback - zodb_uri = kw['zodb_uri'] + zodb_uri = settings['zodb_uri'] finder = PersistentApplicationFinder(zodb_uri, appmaker) def get_root(request): return finder(request.environ) import myapp - return make_app(get_root, myapp, options=kw) + return make_app(get_root, myapp, settings=settings) def appmaker(root): if not 'myapp' in root: -- cgit v1.2.3