summaryrefslogtreecommitdiff
path: root/docs/narr/MyProject/myproject
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-12-05 00:12:38 -0500
committerChris McDonough <chrism@plope.com>2011-12-05 00:12:38 -0500
commit8fe02156794c2cac0cbc6961332f9d8bebc1cb90 (patch)
treeba536c4442a2d97eded4717ae7828c2dc8c7d611 /docs/narr/MyProject/myproject
parent5d462f0c660f939c773862b0fab81728c9ba62c7 (diff)
downloadpyramid-8fe02156794c2cac0cbc6961332f9d8bebc1cb90.tar.gz
pyramid-8fe02156794c2cac0cbc6961332f9d8bebc1cb90.tar.bz2
pyramid-8fe02156794c2cac0cbc6961332f9d8bebc1cb90.zip
the starter scaffold now uses url dispatch; add a minimal section about using another WSGI server; random docs fixes
Diffstat (limited to 'docs/narr/MyProject/myproject')
-rw-r--r--docs/narr/MyProject/myproject/__init__.py4
-rw-r--r--docs/narr/MyProject/myproject/resources.py3
-rw-r--r--docs/narr/MyProject/myproject/static/pyramid-small.pngbin0 -> 7044 bytes
-rw-r--r--docs/narr/MyProject/myproject/tests.py2
-rw-r--r--docs/narr/MyProject/myproject/views.py3
5 files changed, 3 insertions, 9 deletions
diff --git a/docs/narr/MyProject/myproject/__init__.py b/docs/narr/MyProject/myproject/__init__.py
index ddcdd7162..31b02cf02 100644
--- a/docs/narr/MyProject/myproject/__init__.py
+++ b/docs/narr/MyProject/myproject/__init__.py
@@ -1,10 +1,10 @@
from pyramid.config import Configurator
-from .resources import Root
def main(global_config, **settings):
""" This function returns a Pyramid WSGI application.
"""
- config = Configurator(root_factory=Root, settings=settings)
+ config = Configurator(settings=settings)
config.add_static_view('static', 'static', cache_max_age=3600)
+ config.add_route('home', '/')
config.scan()
return config.make_wsgi_app()
diff --git a/docs/narr/MyProject/myproject/resources.py b/docs/narr/MyProject/myproject/resources.py
deleted file mode 100644
index 3d811895c..000000000
--- a/docs/narr/MyProject/myproject/resources.py
+++ /dev/null
@@ -1,3 +0,0 @@
-class Root(object):
- def __init__(self, request):
- self.request = request
diff --git a/docs/narr/MyProject/myproject/static/pyramid-small.png b/docs/narr/MyProject/myproject/static/pyramid-small.png
new file mode 100644
index 000000000..a5bc0ade7
--- /dev/null
+++ b/docs/narr/MyProject/myproject/static/pyramid-small.png
Binary files differ
diff --git a/docs/narr/MyProject/myproject/tests.py b/docs/narr/MyProject/myproject/tests.py
index a32165471..d8b764041 100644
--- a/docs/narr/MyProject/myproject/tests.py
+++ b/docs/narr/MyProject/myproject/tests.py
@@ -14,5 +14,3 @@ class ViewTests(unittest.TestCase):
request = testing.DummyRequest()
info = my_view(request)
self.assertEqual(info['project'], 'MyProject')
-
-
diff --git a/docs/narr/MyProject/myproject/views.py b/docs/narr/MyProject/myproject/views.py
index 5b5d230f2..f571a5976 100644
--- a/docs/narr/MyProject/myproject/views.py
+++ b/docs/narr/MyProject/myproject/views.py
@@ -1,6 +1,5 @@
from pyramid.view import view_config
-from .resources import Root
-@view_config(context=Root, renderer='templates/mytemplate.pt')
+@view_config(route_name='home', renderer='templates/mytemplate.pt')
def my_view(request):
return {'project':'MyProject'}