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/narr/MyProject/myproject/run.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/narr/MyProject/myproject') diff --git a/docs/narr/MyProject/myproject/run.py b/docs/narr/MyProject/myproject/run.py index 19c5cab73..65cd6dfe6 100644 --- a/docs/narr/MyProject/myproject/run.py +++ b/docs/narr/MyProject/myproject/run.py @@ -1,11 +1,11 @@ from repoze.bfg.router import make_app -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 from myproject.models import get_root import myproject - return make_app(get_root, myproject, options=kw) + return make_app(get_root, myproject, settings=settings) -- cgit v1.2.3