Merge pull request #3059 from chrismorales/pyramid_tm_3052

Steve Piercy

2017-06-10 a503511cf82ab1db8c66eb949eeb30da92dd621f

Merge pull request #3059 from chrismorales/pyramid_tm_3052

set pyramid_tm.explicit_manager in the configuration

 docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py

@@ -57,7 +57,7 @@

    """
    settings = config.get_settings()

    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'
    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')


 docs/tutorials/wiki2/definingmodels.rst

@@ -153,7 +153,7 @@
.. literalinclude:: src/models/tutorial/models/__init__.py
   :linenos:
   :language: py
   :emphasize-lines: 8,9
   :emphasize-lines: 10,11

Here we align our imports with the names of the models, ``Page`` and ``User``.


 docs/tutorials/wiki2/src/authentication/tutorial/models/__init__.py

@@ -58,6 +58,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')

 docs/tutorials/wiki2/src/authorization/tutorial/models/__init__.py

@@ -58,6 +58,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')

 docs/tutorials/wiki2/src/basiclayout/tutorial/models/__init__.py

@@ -57,6 +57,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')

 docs/tutorials/wiki2/src/installation/tutorial/models/__init__.py

@@ -57,6 +57,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')

 docs/tutorials/wiki2/src/models/tutorial/__init__.py

@@ -5,6 +5,8 @@
    """ This function returns a Pyramid WSGI application.
    """
    config = Configurator(settings=settings)
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'
    config.include('pyramid_jinja2')
    config.include('.models')
    config.include('.routes')

 docs/tutorials/wiki2/src/models/tutorial/models/__init__.py

@@ -58,6 +58,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')

 docs/tutorials/wiki2/src/tests/tutorial/models/__init__.py

@@ -58,6 +58,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')

 docs/tutorials/wiki2/src/views/tutorial/models/__init__.py

@@ -58,6 +58,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')

 pyramid/scaffolds/alchemy/+package+/models/__init__.py_tmpl

@@ -57,6 +57,7 @@

    """
    settings = config.get_settings()
    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'

    # use pyramid_tm to hook the transaction lifecycle to the request
    config.include('pyramid_tm')

 pyramid/scaffolds/zodb/+package+/__init__.py

@@ -12,6 +12,8 @@
    """ 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.add_static_view('static', 'static', cache_max_age=3600)
    config.scan()