diff options
| author | Ben Bangert <ben@groovie.org> | 2010-11-03 21:10:06 -0700 |
|---|---|---|
| committer | Ben Bangert <ben@groovie.org> | 2010-11-03 21:10:06 -0700 |
| commit | 69ddb24a312b311ee0a9b4122f487a67dfea21ec (patch) | |
| tree | 25a86bc7011db4b94da948f606b4a66189204a62 | |
| parent | f953e120363e618fa2cb8f1fd0c820cf1b9b3e55 (diff) | |
| download | pyramid-69ddb24a312b311ee0a9b4122f487a67dfea21ec.tar.gz pyramid-69ddb24a312b311ee0a9b4122f487a67dfea21ec.tar.bz2 pyramid-69ddb24a312b311ee0a9b4122f487a67dfea21ec.zip | |
Revert "Revert "Changed to use imperative config.""
This reverts commit 20fbdee307e554c2cd44c54fb7860a0ca0a8e19b.
| -rw-r--r-- | pyramid/paster_templates/alchemy/+package+/configure.zcml | 23 | ||||
| -rw-r--r-- | pyramid/paster_templates/alchemy/+package+/run.py_tmpl | 7 |
2 files changed, 5 insertions, 25 deletions
diff --git a/pyramid/paster_templates/alchemy/+package+/configure.zcml b/pyramid/paster_templates/alchemy/+package+/configure.zcml deleted file mode 100644 index 9450b9049..000000000 --- a/pyramid/paster_templates/alchemy/+package+/configure.zcml +++ /dev/null @@ -1,23 +0,0 @@ -<configure xmlns="http://pylonshq.com/pyramid"> - - <!-- this must be included for the view declarations to work --> - <include package="pyramid.includes" /> - - <view - context=".models.MyApp" - view=".views.view_root" - renderer="templates/root.pt" - /> - - <view - context=".models.MyModel" - view=".views.view_model" - renderer="templates/model.pt" - /> - - <static - name="static" - path="templates/static" - /> - -</configure> diff --git a/pyramid/paster_templates/alchemy/+package+/run.py_tmpl b/pyramid/paster_templates/alchemy/+package+/run.py_tmpl index 610b9ed2d..2e349f482 100644 --- a/pyramid/paster_templates/alchemy/+package+/run.py_tmpl +++ b/pyramid/paster_templates/alchemy/+package+/run.py_tmpl @@ -9,7 +9,6 @@ def app(global_config, **settings): It is usually called by the PasteDeploy framework during ``paster serve``. """ - zcml_file = settings.get('configure_zcml', 'configure.zcml') db_string = settings.get('db_string') if db_string is None: raise ValueError("No 'db_string' value in application configuration.") @@ -17,7 +16,11 @@ def app(global_config, **settings): get_root = appmaker(db_string, asbool(db_echo)) config = Configurator(settings=settings, root_factory=get_root) config.begin() - config.load_zcml(zcml_file) + config.add_static_view('static', 'templates/static') + config.add_view('.views.view_root', context='.models.MyApp', + renderer="templates/root.pt") + config.add_view('.views.view_model', context='.models.MyModel', + renderer="templates/model.pt") config.end() return config.make_wsgi_app() |