diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-19 01:20:18 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-19 01:20:18 -0500 |
| commit | ca07a1c93923a275bac1aa71a8a8323522305eb0 (patch) | |
| tree | 87c3cfd819dc94ff94ae11f959f724dc36d800ac | |
| parent | 14b78b33fb6d875c41ab0f95f9d9796cc050d615 (diff) | |
| parent | 80e57b176ce5495788b7aa0fd811f32838601be2 (diff) | |
| download | pyramid-ca07a1c93923a275bac1aa71a8a8323522305eb0.tar.gz pyramid-ca07a1c93923a275bac1aa71a8a8323522305eb0.tar.bz2 pyramid-ca07a1c93923a275bac1aa71a8a8323522305eb0.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | pyramid/paster_templates/starter/+package+/__init__.py_tmpl | 2 | ||||
| -rw-r--r-- | pyramid/paster_templates/starter_zcml/+package+/__init__.py_tmpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pyramid/paster_templates/starter/+package+/__init__.py_tmpl b/pyramid/paster_templates/starter/+package+/__init__.py_tmpl index 7627e75eb..3cfaa63a2 100644 --- a/pyramid/paster_templates/starter/+package+/__init__.py_tmpl +++ b/pyramid/paster_templates/starter/+package+/__init__.py_tmpl @@ -6,7 +6,7 @@ def main(global_config, **settings): """ config = Configurator(root_factory=Root, settings=settings) config.add_view('{{package}}.views.my_view', - context='{{package}}:resources.Root" + context='{{package}}:resources.Root', renderer='{{package}}:templates/mytemplate.pt') config.add_static_view('static', '{{package}}:static') return config.make_wsgi_app() diff --git a/pyramid/paster_templates/starter_zcml/+package+/__init__.py_tmpl b/pyramid/paster_templates/starter_zcml/+package+/__init__.py_tmpl index 896aabca7..25d45b949 100644 --- a/pyramid/paster_templates/starter_zcml/+package+/__init__.py_tmpl +++ b/pyramid/paster_templates/starter_zcml/+package+/__init__.py_tmpl @@ -1,5 +1,5 @@ from pyramid.config import Configurator -from {{package}}.models import Root +from {{package}}.resources import Root def main(global_config, **settings): """ This function returns a Pyramid WSGI application. |