summaryrefslogtreecommitdiff
path: root/docs/narr/MyProject/myproject
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-12-10 15:34:30 -0500
committerChris McDonough <chrism@plope.com>2012-12-10 15:34:30 -0500
commit8389a5b3339b18f2ba7242d05d11ecb64371f3d9 (patch)
tree113a6b7aea8015518c89cfa42e9bb0df34bed37c /docs/narr/MyProject/myproject
parenta078e197d04400d2430206fe31e3398c761b20a3 (diff)
parentf3a84be3b0e37b74acc26cfb413800610af85b86 (diff)
downloadpyramid-8389a5b3339b18f2ba7242d05d11ecb64371f3d9.tar.gz
pyramid-8389a5b3339b18f2ba7242d05d11ecb64371f3d9.tar.bz2
pyramid-8389a5b3339b18f2ba7242d05d11ecb64371f3d9.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/MyProject/myproject')
-rw-r--r--docs/narr/MyProject/myproject/__init__.py1
-rw-r--r--docs/narr/MyProject/myproject/tests.py1
-rw-r--r--docs/narr/MyProject/myproject/views.py3
3 files changed, 4 insertions, 1 deletions
diff --git a/docs/narr/MyProject/myproject/__init__.py b/docs/narr/MyProject/myproject/__init__.py
index 31b02cf02..6c512f52f 100644
--- a/docs/narr/MyProject/myproject/__init__.py
+++ b/docs/narr/MyProject/myproject/__init__.py
@@ -1,5 +1,6 @@
from pyramid.config import Configurator
+
def main(global_config, **settings):
""" This function returns a Pyramid WSGI application.
"""
diff --git a/docs/narr/MyProject/myproject/tests.py b/docs/narr/MyProject/myproject/tests.py
index d8b764041..64dcab1d5 100644
--- a/docs/narr/MyProject/myproject/tests.py
+++ b/docs/narr/MyProject/myproject/tests.py
@@ -2,6 +2,7 @@ import unittest
from pyramid import testing
+
class ViewTests(unittest.TestCase):
def setUp(self):
self.config = testing.setUp()
diff --git a/docs/narr/MyProject/myproject/views.py b/docs/narr/MyProject/myproject/views.py
index f571a5976..c383c5716 100644
--- a/docs/narr/MyProject/myproject/views.py
+++ b/docs/narr/MyProject/myproject/views.py
@@ -1,5 +1,6 @@
from pyramid.view import view_config
+
@view_config(route_name='home', renderer='templates/mytemplate.pt')
def my_view(request):
- return {'project':'MyProject'}
+ return {'project': 'MyProject'}