- Remove calls to config.begin()/config.end() from startup config code in

  tutorials and paster templates (no longer required).

5 files changed, 3 insertions, 17 deletions

diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 9aca94fe5..9bcc17e97 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -52,10 +52,7 @@ entry point happens to be the ``app`` function within the file named
    deployment-related values such as ``reload_templates``,
    ``db_string``, etc.
 
-#. *Line 15*.  We call :meth:`pyramid.configuration.Configurator.begin` which
-    tells the configuration machinery we are starting configuration.
-
-#. *Line 16*.  We call
+#. *Line 15*.  We call
    :meth:`pyramid.configuration.Configurator.add_static_view` with the
    arguments ``static`` (the name), and ``tutorial:static`` (the path).  This
    registers a static resource view which will match any URL that starts with
@@ -67,7 +64,7 @@ entry point happens to be the ``app`` function within the file named
    ``/static/foo``) will be used to compose a path to a static file resource,
    such as a CSS file.
 
-#. *Lines 17-18*.  Register a :term:`route configuration` via the
+#. *Lines 16-17*.  Register a :term:`route configuration` via the
    :meth:`pyramid.configuration.Configurator.add_route` method that will be
    used when the URL is ``/``.  Since this route has an ``pattern`` equalling
    ``/`` it is the "default" route. The argument named ``view`` with the
@@ -81,10 +78,7 @@ entry point happens to be the ``app`` function within the file named
    ``tutorial.views.my_view`` view returns a dictionary, a :term:`renderer`
    will use this template to create a response.
 
-#. *Line 19*.  We call :meth:`pyramid.configuration.Configurator.end` which
-    tells the configuration machinery we are ending configuration.
-
-#. *Line 20*.  We use the
+#. *Line 18*.  We use the
    :meth:`pyramid.configuration.Configurator.make_wsgi_app` method to return
    a :term:`WSGI` application.
 
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
index 4bddea74c..8269617f2 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
@@ -22,7 +22,6 @@ def main(global_config, **settings):
                           root_factory='tutorial.models.RootFactory',
                           authentication_policy=authn_policy,
                           authorization_policy=authz_policy)
-    config.begin()
     config.add_static_view('static', 'tutorial:static')
     config.add_route('view_wiki', '/', view='tutorial.views.view_wiki')
     config.add_route('login', '/login',
@@ -44,6 +43,5 @@ def main(global_config, **settings):
     config.add_view('tutorial.login.login',
                     renderer='tutorial:templates/login.pt',
                     context='pyramid.exceptions.Forbidden')
-    config.end()
     return config.make_wsgi_app()
 
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
index 7a701fc02..0ae61fccd 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
@@ -12,11 +12,9 @@ def main(global_config, **settings):
     db_echo = settings.get('db_echo', 'false')
     initialize_sql(db_string, asbool(db_echo))
     config = Configurator(settings=settings)
-    config.begin()
     config.add_static_view('static', 'tutorial:static')
     config.add_route('home', '/', view='tutorial.views.my_view',
                      view_renderer='templates/mytemplate.pt')
-    config.end()
     return config.make_wsgi_app()
 
 
diff --git a/docs/tutorials/wiki2/src/models/tutorial/__init__.py b/docs/tutorials/wiki2/src/models/tutorial/__init__.py
index 10fcd0cbc..6e291ffdf 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/models/tutorial/__init__.py
@@ -12,9 +12,7 @@ def main(global_config, **settings):
     db_echo = settings.get('db_echo', 'false')
     initialize_sql(db_string, asbool(db_echo))
     config = Configurator(settings=settings)
-    config.begin()
     config.add_static_view('static', 'tutorial:static')
     config.add_route('home', '/', view='tutorial.views.my_view',
                      view_renderer='templates/mytemplate.pt')
-    config.end()
     return config.make_wsgi_app()
diff --git a/docs/tutorials/wiki2/src/views/tutorial/__init__.py b/docs/tutorials/wiki2/src/views/tutorial/__init__.py
index 9ef923e0b..947ce9b93 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/__init__.py
@@ -12,7 +12,6 @@ def main(global_config, **settings):
     db_echo = settings.get('db_echo', 'false')
     initialize_sql(db_string, asbool(db_echo))
     config = Configurator(settings=settings)
-    config.begin()
     config.add_static_view('static', 'tutorial:static')
     config.add_route('home', '/', view='tutorial.views.view_wiki')
     config.add_route('view_page', '/:pagename',
@@ -24,6 +23,5 @@ def main(global_config, **settings):
     config.add_route('edit_page', '/:pagename/edit_page',
                      view='tutorial.views.edit_page',
                      view_renderer='tutorial:templates/edit.pt')
-    config.end()
     return config.make_wsgi_app()