diff options
| author | Michael Merickel <michael@merickel.org> | 2015-11-12 12:56:27 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-11-12 12:56:46 -0600 |
| commit | 414b67b45bab156b9738105e180908c4eee8600a (patch) | |
| tree | 6a9ee22d939c88f35786da0f06ff32b98102e374 /docs/tutorials/wiki2/src/basiclayout | |
| parent | b4c96d2892d8271b300b1920e3ce5d2c0eae588b (diff) | |
| download | pyramid-414b67b45bab156b9738105e180908c4eee8600a.tar.gz pyramid-414b67b45bab156b9738105e180908c4eee8600a.tar.bz2 pyramid-414b67b45bab156b9738105e180908c4eee8600a.zip | |
Restore progress after backing changes out of master.
This reverts commit 049e670aef9ea5611561546fd5c0e2dd6152b9b7.
Diffstat (limited to 'docs/tutorials/wiki2/src/basiclayout')
| -rw-r--r-- | docs/tutorials/wiki2/src/basiclayout/development.ini | 4 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/src/basiclayout/production.ini | 2 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py | 12 |
3 files changed, 5 insertions, 13 deletions
diff --git a/docs/tutorials/wiki2/src/basiclayout/development.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini index a9d53b296..99c4ff0fe 100644 --- a/docs/tutorials/wiki2/src/basiclayout/development.ini +++ b/docs/tutorials/wiki2/src/basiclayout/development.ini @@ -27,7 +27,7 @@ sqlalchemy.url = sqlite:///%(here)s/tutorial.sqlite [server:main] use = egg:waitress#main -host = 0.0.0.0 +host = 127.0.0.1 port = 6543 ### @@ -68,4 +68,4 @@ level = NOTSET formatter = generic [formatter_generic] -format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s +format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s diff --git a/docs/tutorials/wiki2/src/basiclayout/production.ini b/docs/tutorials/wiki2/src/basiclayout/production.ini index fa94c1b3e..97acfbd7d 100644 --- a/docs/tutorials/wiki2/src/basiclayout/production.ini +++ b/docs/tutorials/wiki2/src/basiclayout/production.ini @@ -59,4 +59,4 @@ level = NOTSET formatter = generic [formatter_generic] -format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s +format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s 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() |