summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src/basiclayout
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-09-22 10:04:31 -0400
committerChris McDonough <chrism@plope.com>2012-09-22 10:04:31 -0400
commitf55cec52d3a2a64345ac2bce30c26ab274c8baea (patch)
tree6acc79ac91fc1cad787e70b73bca0e75da072d8e /docs/tutorials/wiki2/src/basiclayout
parent3c05fb076c617fa0c8820344135cfe9e028400a8 (diff)
parent098599b497fb6cd7c9372ceb795e9e8a416d573e (diff)
downloadpyramid-f55cec52d3a2a64345ac2bce30c26ab274c8baea.tar.gz
pyramid-f55cec52d3a2a64345ac2bce30c26ab274c8baea.tar.bz2
pyramid-f55cec52d3a2a64345ac2bce30c26ab274c8baea.zip
Merge branch '1.4-branch'
Diffstat (limited to 'docs/tutorials/wiki2/src/basiclayout')
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
index 253341563..e39f619ed 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
@@ -1,13 +1,17 @@
from pyramid.config import Configurator
from sqlalchemy import engine_from_config
-from .models import DBSession
+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.add_static_view('static', 'static', cache_max_age=3600)
config.add_route('home', '/')