summaryrefslogtreecommitdiff
path: root/docs/narr/MyProject
diff options
context:
space:
mode:
authorCasey Duncan <casey.duncan@gmail.com>2010-11-19 23:25:44 -0700
committerCasey Duncan <casey.duncan@gmail.com>2010-11-19 23:25:44 -0700
commitb6f6e5506fa51a79eb5b0bb3c95b01878526fbff (patch)
tree277dbc6019c7f5b0f2cb1b35074186e247f526a8 /docs/narr/MyProject
parent673d55a3188d88c5fcf66062a894818a66722334 (diff)
parentdd53294c3342f58e0fb62b20ad61e59c1f88ac8b (diff)
downloadpyramid-b6f6e5506fa51a79eb5b0bb3c95b01878526fbff.tar.gz
pyramid-b6f6e5506fa51a79eb5b0bb3c95b01878526fbff.tar.bz2
pyramid-b6f6e5506fa51a79eb5b0bb3c95b01878526fbff.zip
merge changes from master
Diffstat (limited to 'docs/narr/MyProject')
-rw-r--r--docs/narr/MyProject/myproject/__init__.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/docs/narr/MyProject/myproject/__init__.py b/docs/narr/MyProject/myproject/__init__.py
index bfbbfd4df..580dfe546 100644
--- a/docs/narr/MyProject/myproject/__init__.py
+++ b/docs/narr/MyProject/myproject/__init__.py
@@ -5,11 +5,8 @@ def main(global_config, **settings):
""" This function returns a Pyramid WSGI application.
"""
config = Configurator(root_factory=get_root, settings=settings)
- config.begin()
config.add_view('myproject.views.my_view',
context='myproject.models.MyModel',
renderer='myproject:templates/mytemplate.pt')
config.add_static_view('static', 'myproject:static')
- config.end()
return config.make_wsgi_app()
-