summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/src/basiclayout
diff options
context:
space:
mode:
authorPatricio Paez <pp@pp.com.mx>2012-12-01 17:04:33 -0600
committerPatricio Paez <pp@pp.com.mx>2012-12-01 17:58:50 -0600
commit6d1eeedcd341a0468a2567f3034dde4d6dbcc6bd (patch)
tree59b65e6f232073030d3609ccc40a837535c58b0b /docs/tutorials/wiki/src/basiclayout
parentd85569e38ba88029864b7908dbee3f948b103712 (diff)
downloadpyramid-6d1eeedcd341a0468a2567f3034dde4d6dbcc6bd.tar.gz
pyramid-6d1eeedcd341a0468a2567f3034dde4d6dbcc6bd.tar.bz2
pyramid-6d1eeedcd341a0468a2567f3034dde4d6dbcc6bd.zip
Sync ZODB tutorial source files with the scaffold
Diffstat (limited to 'docs/tutorials/wiki/src/basiclayout')
-rw-r--r--docs/tutorials/wiki/src/basiclayout/setup.py9
-rw-r--r--docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py2
-rw-r--r--docs/tutorials/wiki/src/basiclayout/tutorial/models.py2
-rw-r--r--docs/tutorials/wiki/src/basiclayout/tutorial/tests.py1
-rw-r--r--docs/tutorials/wiki/src/basiclayout/tutorial/views.py3
5 files changed, 10 insertions, 7 deletions
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py
index 647c3a638..4998be902 100644
--- a/docs/tutorials/wiki/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki/src/basiclayout/setup.py
@@ -19,7 +19,7 @@ requires = [
setup(name='tutorial',
version='0.0',
description='tutorial',
- long_description=README + '\n\n' + CHANGES,
+ long_description=README + '\n\n' + CHANGES,
classifiers=[
"Programming Language :: Python",
"Framework :: Pyramid",
@@ -33,12 +33,11 @@ setup(name='tutorial',
packages=find_packages(),
include_package_data=True,
zip_safe=False,
- install_requires = requires,
- tests_require= requires,
+ install_requires=requires,
+ tests_require=requires,
test_suite="tutorial",
- entry_points = """\
+ entry_points="""\
[paste.app_factory]
main = tutorial:main
""",
)
-
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
index b63933fc5..c3bb87a62 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py
@@ -2,10 +2,12 @@ from pyramid.config import Configurator
from pyramid_zodbconn import get_connection
from .models import appmaker
+
def root_factory(request):
conn = get_connection(request)
return appmaker(conn.root())
+
def main(global_config, **settings):
""" This function returns a Pyramid WSGI application.
"""
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/models.py b/docs/tutorials/wiki/src/basiclayout/tutorial/models.py
index 8dd0f5a49..a94b36ef4 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/models.py
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/models.py
@@ -1,8 +1,10 @@
from persistent.mapping import PersistentMapping
+
class MyModel(PersistentMapping):
__parent__ = __name__ = None
+
def appmaker(zodb_root):
if not 'app_root' in zodb_root:
app_root = MyModel()
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py b/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py
index 8d2374be1..7f6523c66 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py
@@ -14,4 +14,3 @@ class ViewTests(unittest.TestCase):
request = testing.DummyRequest()
info = my_view(request)
self.assertEqual(info['project'], 'tutorial')
-
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/views.py b/docs/tutorials/wiki/src/basiclayout/tutorial/views.py
index 4265b6bf7..628ce15ed 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/views.py
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/views.py
@@ -1,6 +1,7 @@
from pyramid.view import view_config
from .models import MyModel
+
@view_config(context=MyModel, renderer='templates/mytemplate.pt')
def my_view(request):
- return {'project':'tutorial'}
+ return {'project': 'tutorial'}