diff --git a/edbob/pyramid/__init__.py b/edbob/pyramid/__init__.py index ba60dd0..e5c4633 100644 --- a/edbob/pyramid/__init__.py +++ b/edbob/pyramid/__init__.py @@ -1,63 +1,66 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -################################################################################ -# -# edbob -- Pythonic Software Framework -# Copyright © 2010-2012 Lance Edgar -# -# This file is part of edbob. -# -# edbob is free software: you can redistribute it and/or modify it under the -# terms of the GNU Affero General Public License as published by the Free -# Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# edbob is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for -# more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with edbob. If not, see . -# -################################################################################ - -""" -``edbob.pyramid`` -- Pyramid Framework -""" - -from sqlalchemy.orm import scoped_session -from zope.sqlalchemy import ZopeTransactionExtension - -import edbob.db - - -__all__ = ['Session'] - -Session = scoped_session(edbob.db.Session) - - -def includeme(config): - """ - Adds ``edbob``-specific features to the application. Currently this does - two things: - - It adds a ``ZopeTransactionExtension`` instance as an extension to the - SQLAlchemy scoped ``Session`` class. This is necessary for most view code - that ships with ``edbob``, so you will most likely need to specify - ``config.include('edbob.pyramid')`` somewhere in your app config (i.e. your - ``main()`` function). - - The other thing added is the ``edbob`` static view for CSS files etc. - """ - - # Session is extended here instead of at module scope to prevent import - # side-effects. - Session.configure(extension=ZopeTransactionExtension()) - - # Forbidden view is configured here instead of within edbob.pyramid.views - # since it's so "important." - config.add_forbidden_view('edbob.pyramid.views.forbidden') - - # Same goes with the edbob static route; we need that JS. - config.include('edbob.pyramid.static') +#!/usr/bin/env python +# -*- coding: utf-8 -*- +################################################################################ +# +# edbob -- Pythonic Software Framework +# Copyright © 2010-2012 Lance Edgar +# +# This file is part of edbob. +# +# edbob is free software: you can redistribute it and/or modify it under the +# terms of the GNU Affero General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# edbob is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for +# more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with edbob. If not, see . +# +################################################################################ + +""" +``edbob.pyramid`` -- Pyramid Framework +""" + +from sqlalchemy.orm import scoped_session +from zope.sqlalchemy import ZopeTransactionExtension + +import edbob.db + + +__all__ = ['Session'] + +Session = scoped_session(edbob.db.Session) + + +def includeme(config): + """ + Adds ``edbob``-specific features to the application. Currently this does + two things: + + It adds a ``ZopeTransactionExtension`` instance as an extension to the + SQLAlchemy scoped ``Session`` class. This is necessary for most view code + that ships with ``edbob``, so you will most likely need to specify + ``config.include('edbob.pyramid')`` somewhere in your app config (i.e. your + ``main()`` function). + + The other thing added is the ``edbob`` static view for CSS files etc. + """ + + # Session is extended here instead of at module scope to prevent import + # side-effects. + Session.configure(extension=ZopeTransactionExtension()) + + # Forbidden view is configured here instead of within edbob.pyramid.views + # since it's so "important." + config.add_forbidden_view('edbob.pyramid.views.forbidden') + + # Same goes with the edbob static route; we need that JS. + config.include('edbob.pyramid.static') + + # Include transaction manager tween. + config.include('pyramid_tm')