From 34e974e360184baef873da55f31379697e367f32 Mon Sep 17 00:00:00 2001 From: Paul Everitt Date: Wed, 25 Sep 2013 12:08:33 -0400 Subject: Get pyramid_chameleon added to the quick tutorial, plus some other fixes for Python 3. --- docs/quick_tutorial/scaffolds/scaffolds/__init__.py | 1 + docs/quick_tutorial/scaffolds/scaffolds/templates/mytemplate.pt | 7 ++----- docs/quick_tutorial/scaffolds/setup.py | 7 +++++-- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'docs/quick_tutorial/scaffolds') 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 @@ - The Pyramid Web Application Development Framework + The Pyramid Web Framework @@ -24,7 +24,7 @@

Welcome to ${project}, an application generated by
- the Pyramid web application development framework. + the Pyramid Web Framework.

@@ -69,8 +69,5 @@ - 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', ] -- cgit v1.2.3