summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src/basiclayout
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2015-11-11 18:34:44 -0800
committerSteve Piercy <web@stevepiercy.com>2015-11-11 18:34:44 -0800
commitfea87a5cbb4edbfef204283c23d5b0d8fb5220f8 (patch)
treeaa31ac361645ad7606743a0dbdd28ef8ae327410 /docs/tutorials/wiki2/src/basiclayout
parentc043c779861b7a710ef326d912b57ddf1fed8eaa (diff)
downloadpyramid-fea87a5cbb4edbfef204283c23d5b0d8fb5220f8.tar.gz
pyramid-fea87a5cbb4edbfef204283c23d5b0d8fb5220f8.tar.bz2
pyramid-fea87a5cbb4edbfef204283c23d5b0d8fb5220f8.zip
- update basiclayout/tutorial/__init__.py
- update section "Application configuration with ``__init__.py``" - move WIP to "Content Models with ``models.py``", wrapped by Sphinx comments
Diffstat (limited to 'docs/tutorials/wiki2/src/basiclayout')
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
index 867049e4f..7994bbfa8 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
@@ -1,20 +1,12 @@
from pyramid.config import Configurator
-from sqlalchemy import engine_from_config
-
-from .models import (
- DBSession,
- Base,
- )
def main(global_config, **settings):
""" This function returns a Pyramid WSGI application.
"""
- engine = engine_from_config(settings, 'sqlalchemy.')
- DBSession.configure(bind=engine)
- Base.metadata.bind = engine
config = Configurator(settings=settings)
- config.include('pyramid_chameleon')
+ config.include('pyramid_jinja2')
+ config.include('.models.meta')
config.add_static_view('static', 'static', cache_max_age=3600)
config.add_route('home', '/')
config.scan()