summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Bangert <ben@groovie.org>2010-11-03 16:45:40 -0700
committerBen Bangert <ben@groovie.org>2010-11-03 16:45:40 -0700
commit84e445db4cce4d9f29bf76efa73291c48989267c (patch)
treebefe3932d70541a1e05aafeb508a5fef7f064166
parent108698b020c4b360c180ab3faa6f11e45a51439c (diff)
downloadpyramid-84e445db4cce4d9f29bf76efa73291c48989267c.tar.gz
pyramid-84e445db4cce4d9f29bf76efa73291c48989267c.tar.bz2
pyramid-84e445db4cce4d9f29bf76efa73291c48989267c.zip
Changed to use imperative config.
-rw-r--r--pyramid/paster_templates/alchemy/+package+/configure.zcml23
-rw-r--r--pyramid/paster_templates/alchemy/+package+/run.py_tmpl7
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()