summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial/scaffolds
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-09-25 12:08:33 -0400
committerPaul Everitt <paul@agendaless.com>2013-09-25 12:08:33 -0400
commit34e974e360184baef873da55f31379697e367f32 (patch)
treea1bfd80a83566c5b9500cd6754599e055cfbb458 /docs/quick_tutorial/scaffolds
parent94e72c2fe1ca6acc1dc50ab8c0da48e0e191b4df (diff)
downloadpyramid-34e974e360184baef873da55f31379697e367f32.tar.gz
pyramid-34e974e360184baef873da55f31379697e367f32.tar.bz2
pyramid-34e974e360184baef873da55f31379697e367f32.zip
Get pyramid_chameleon added to the quick tutorial, plus some other fixes for Python 3.
Diffstat (limited to 'docs/quick_tutorial/scaffolds')
-rw-r--r--docs/quick_tutorial/scaffolds/scaffolds/__init__.py1
-rw-r--r--docs/quick_tutorial/scaffolds/scaffolds/templates/mytemplate.pt7
-rw-r--r--docs/quick_tutorial/scaffolds/setup.py7
3 files changed, 8 insertions, 7 deletions
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/__init__.py b/docs/quick_tutorial/scaffolds/scaffolds/__init__.py
index 6c512f52f..ad5ecbc6f 100644
--- a/docs/quick_tutorial/scaffolds/scaffolds/__init__.py
+++ b/docs/quick_tutorial/scaffolds/scaffolds/__init__.py
@@ -5,6 +5,7 @@ def main(global_config, **settings):
""" This function returns a Pyramid WSGI application.
"""
config = Configurator(settings=settings)
+ config.include('pyramid_chameleon')
config.add_static_view('static', 'static', cache_max_age=3600)
config.add_route('home', '/')
config.scan()
diff --git a/docs/quick_tutorial/scaffolds/scaffolds/templates/mytemplate.pt b/docs/quick_tutorial/scaffolds/scaffolds/templates/mytemplate.pt
index d04da4649..b43a174e3 100644
--- a/docs/quick_tutorial/scaffolds/scaffolds/templates/mytemplate.pt
+++ b/docs/quick_tutorial/scaffolds/scaffolds/templates/mytemplate.pt
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal">
<head>
- <title>The Pyramid Web Application Development Framework</title>
+ <title>The Pyramid Web Framework</title>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
<meta name="keywords" content="python web application" />
<meta name="description" content="pyramid web application" />
@@ -24,7 +24,7 @@
<div class="middle align-center">
<p class="app-welcome">
Welcome to <span class="app-name">${project}</span>, an application generated by<br/>
- the Pyramid web application development framework.
+ the Pyramid Web Framework.
</p>
</div>
</div>
@@ -69,8 +69,5 @@
</div>
</div>
</div>
- <div id="footer">
- <div class="footer">&copy; Copyright 2008-2012, Agendaless Consulting.</div>
- </div>
</body>
</html>
diff --git a/docs/quick_tutorial/scaffolds/setup.py b/docs/quick_tutorial/scaffolds/setup.py
index 2af00a69e..ec95946a5 100644
--- a/docs/quick_tutorial/scaffolds/setup.py
+++ b/docs/quick_tutorial/scaffolds/setup.py
@@ -3,11 +3,14 @@ import os
from setuptools import setup, find_packages
here = os.path.abspath(os.path.dirname(__file__))
-README = open(os.path.join(here, 'README.txt')).read()
-CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
+with open(os.path.join(here, 'README.txt')) as f:
+ README = f.read()
+with open(os.path.join(here, 'CHANGES.txt')) as f:
+ CHANGES = f.read()
requires = [
'pyramid',
+ 'pyramid_chameleon',
'pyramid_debugtoolbar',
'waitress',
]