From 2eb1fe864bc87fffade4f012e57e718d70a6116e Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Fri, 04 Aug 2017 07:52:58 +0200
Subject: [PATCH] Merge pull request #3142 from stevepiercy/1.9-branch
---
docs/tutorials/wiki/src/installation/tutorial/__init__.py | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/docs/tutorials/wiki/src/installation/tutorial/__init__.py b/docs/tutorials/wiki/src/installation/tutorial/__init__.py
index eb703e0..f2b3c95 100644
--- a/docs/tutorials/wiki/src/installation/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/installation/tutorial/__init__.py
@@ -11,13 +11,13 @@
def main(global_config, **settings):
""" This function returns a Pyramid WSGI application.
"""
- config = Configurator(root_factory=root_factory, settings=settings)
- settings = config.get_settings()
settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'
- config.include('pyramid_chameleon')
- config.include('pyramid_tm')
- config.include('pyramid_retry')
- config.include('pyramid_zodbconn')
- config.add_static_view('static', 'static', cache_max_age=3600)
- config.scan()
- return config.make_wsgi_app()
+ with Configurator(settings=settings) as config:
+ config.include('pyramid_chameleon')
+ config.include('pyramid_tm')
+ config.include('pyramid_retry')
+ config.include('pyramid_zodbconn')
+ config.set_root_factory(root_factory)
+ config.add_static_view('static', 'static', cache_max_age=3600)
+ config.scan()
+ return config.make_wsgi_app()
--
Gitblit v1.9.3