From 44b2ca3219cf495ae0d3a66b81befdf368ef916d Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 23 Nov 2009 08:30:38 +0000 Subject: - The ``repoze.bfg.router.make_app`` function is now nominally deprecated. Its import and usage does not throw a warning, nor will it probably ever disappear. However, using a ``repoze.bfg.configuration.Configurator`` class is now the preferred way to generate a WSGI application. - The ``run.py`` module in various ``repoze.bfg`` ``paster`` templates now use a ``repoze.bfg.configuration.Configurator`` class instead of the (now-legacy) ``repoze.bfg.router.make_app`` function to produce a WSGI application. --- repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'repoze/bfg/paster_templates/zodb') diff --git a/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl b/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl index e61816f9a..4fc20798d 100644 --- a/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl +++ b/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl @@ -1,4 +1,4 @@ -from repoze.bfg.router import make_app +from repoze.bfg.configuration import Configurator from repoze.zodbconn.finder import PersistentApplicationFinder def app(global_config, **settings): @@ -6,8 +6,6 @@ def app(global_config, **settings): It is usually called by the PasteDeploy framework during ``paster serve``. """ - # paster app config callback - import {{package}} from {{package}}.models import appmaker zodb_uri = settings.get('zodb_uri') if zodb_uri is None: @@ -16,4 +14,7 @@ def app(global_config, **settings): finder = PersistentApplicationFinder(zodb_uri, appmaker) def get_root(request): return finder(request.environ) - return make_app(get_root, {{package}}, settings=settings) + zcml_file = settings.get('configure_zcml', 'configure.zcml') + config = Configurator(root_factory=get_root, + settings=settings, zcml_file=zcml_file) + return config.make_wsgi_app() -- cgit v1.2.3