diff options
Diffstat (limited to 'docs')
14 files changed, 72 insertions, 80 deletions
diff --git a/docs/tutorials/bfgwiki/src/authorization/CHANGES.txt b/docs/tutorials/bfgwiki/src/authorization/CHANGES.txt index 1544cf53b..e14f633ab 100644 --- a/docs/tutorials/bfgwiki/src/authorization/CHANGES.txt +++ b/docs/tutorials/bfgwiki/src/authorization/CHANGES.txt @@ -1,3 +1,5 @@ -0.1 +0.0 +--- + +- Initial version - Initial version diff --git a/docs/tutorials/bfgwiki/src/authorization/setup.py b/docs/tutorials/bfgwiki/src/authorization/setup.py index 76837aee1..49679656d 100644 --- a/docs/tutorials/bfgwiki/src/authorization/setup.py +++ b/docs/tutorials/bfgwiki/src/authorization/setup.py @@ -15,22 +15,20 @@ requires = [ ] setup(name='tutorial', - version='0.1', + version='0.0', description='tutorial', long_description=README + '\n\n' + CHANGES, classifiers=[ - "Development Status :: 3 - Alpha", "Intended Audience :: Developers", + "Framework :: BFG", "Programming Language :: Python", "Topic :: Internet :: WWW/HTTP", - "Topic :: Internet :: WWW/HTTP :: Dynamic Content", - "Topic :: Internet :: WWW/HTTP :: WSGI", "Topic :: Internet :: WWW/HTTP :: WSGI :: Application", ], author='', author_email='', url='', - keywords='web wsgi bfg zope', + keywords='web wsgi bfg', packages=find_packages(), include_package_data=True, zip_safe=False, diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py index 178c8741c..98baa440b 100644 --- a/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py +++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py @@ -1,20 +1,20 @@ -from repoze.bfg.router import make_app +from repoze.bfg.configuration import Configurator from repoze.zodbconn.finder import PersistentApplicationFinder +from tutorial.models import appmaker def app(global_config, **settings): - """ This function returns a repoze.bfg.router.Router object. + """ This function returns a ``repoze.bfg`` WSGI application. It is usually called by the PasteDeploy framework during ``paster serve``. """ - # paster app config callback - import tutorial - from tutorial.models import appmaker zodb_uri = settings.get('zodb_uri') if zodb_uri is None: raise ValueError("No 'zodb_uri' in application configuration.") finder = PersistentApplicationFinder(zodb_uri, appmaker) def get_root(request): return finder(request.environ) - return make_app(get_root, tutorial, settings=settings) + config = Configurator(root_factory=get_root, settings=settings) + config.load_zcml('configure.zcml') + return config.make_wsgi_app() diff --git a/docs/tutorials/bfgwiki/src/basiclayout/CHANGES.txt b/docs/tutorials/bfgwiki/src/basiclayout/CHANGES.txt index 1544cf53b..ffa255da8 100644 --- a/docs/tutorials/bfgwiki/src/basiclayout/CHANGES.txt +++ b/docs/tutorials/bfgwiki/src/basiclayout/CHANGES.txt @@ -1,3 +1,4 @@ -0.1 +0.0 +--- - Initial version +- Initial version diff --git a/docs/tutorials/bfgwiki/src/basiclayout/setup.py b/docs/tutorials/bfgwiki/src/basiclayout/setup.py index 24d97ef71..35cf22893 100644 --- a/docs/tutorials/bfgwiki/src/basiclayout/setup.py +++ b/docs/tutorials/bfgwiki/src/basiclayout/setup.py @@ -6,39 +6,37 @@ here = os.path.abspath(os.path.dirname(__file__)) README = open(os.path.join(here, 'README.txt')).read() CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() +requires = [ + 'repoze.bfg', + 'docutils', + 'ZODB3', + 'repoze.zodbconn', + 'repoze.tm', + ] + setup(name='tutorial', - version='0.1', + version='0.0', description='tutorial', long_description=README + '\n\n' + CHANGES, classifiers=[ - "Development Status :: 3 - Alpha", "Intended Audience :: Developers", + "Framework :: BFG", "Programming Language :: Python", "Topic :: Internet :: WWW/HTTP", - "Topic :: Internet :: WWW/HTTP :: Dynamic Content", - "Topic :: Internet :: WWW/HTTP :: WSGI", "Topic :: Internet :: WWW/HTTP :: WSGI :: Application", ], author='', author_email='', url='', - keywords='web wsgi bfg zope', + keywords='web wsgi bfg', packages=find_packages(), include_package_data=True, zip_safe=False, - install_requires=[ - 'repoze.bfg', - 'repoze.zodbconn', - 'repoze.tm', - 'ZODB3', - ], - tests_require=[ - 'repoze.bfg', - ], + install_requires=requires, + tests_require=requires, test_suite="tutorial", entry_points = """\ [paste.app_factory] app = tutorial.run:app """ ) - diff --git a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py index b963f0aaa..748b13eef 100644 --- a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py +++ b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/run.py @@ -1,19 +1,19 @@ -from repoze.bfg.router import make_app +from repoze.bfg.configuration import Configurator from repoze.zodbconn.finder import PersistentApplicationFinder +from tutorial.models import appmaker + def app(global_config, **settings): - """ This function returns a repoze.bfg.router.Router object. + """ This function returns a ``repoze.bfg`` WSGI application. It is usually called by the PasteDeploy framework during ``paster serve``. """ - # paster app config callback - import tutorial - from tutorial.models import appmaker zodb_uri = settings.get('zodb_uri') if zodb_uri is None: raise ValueError("No 'zodb_uri' in application configuration.") - finder = PersistentApplicationFinder(zodb_uri, appmaker) def get_root(request): return finder(request.environ) - return make_app(get_root, tutorial, settings=settings) + config = Configurator(root_factory=get_root, settings=settings) + config.load_zcml('configure.zcml') + return config.make_wsgi_app() diff --git a/docs/tutorials/bfgwiki/src/models/CHANGES.txt b/docs/tutorials/bfgwiki/src/models/CHANGES.txt index 1544cf53b..ffa255da8 100644 --- a/docs/tutorials/bfgwiki/src/models/CHANGES.txt +++ b/docs/tutorials/bfgwiki/src/models/CHANGES.txt @@ -1,3 +1,4 @@ -0.1 +0.0 +--- - Initial version +- Initial version diff --git a/docs/tutorials/bfgwiki/src/models/setup.py b/docs/tutorials/bfgwiki/src/models/setup.py index 76837aee1..35cf22893 100644 --- a/docs/tutorials/bfgwiki/src/models/setup.py +++ b/docs/tutorials/bfgwiki/src/models/setup.py @@ -15,22 +15,20 @@ requires = [ ] setup(name='tutorial', - version='0.1', + version='0.0', description='tutorial', long_description=README + '\n\n' + CHANGES, classifiers=[ - "Development Status :: 3 - Alpha", "Intended Audience :: Developers", + "Framework :: BFG", "Programming Language :: Python", "Topic :: Internet :: WWW/HTTP", - "Topic :: Internet :: WWW/HTTP :: Dynamic Content", - "Topic :: Internet :: WWW/HTTP :: WSGI", "Topic :: Internet :: WWW/HTTP :: WSGI :: Application", ], author='', author_email='', url='', - keywords='web wsgi bfg zope', + keywords='web wsgi bfg', packages=find_packages(), include_package_data=True, zip_safe=False, @@ -42,4 +40,3 @@ setup(name='tutorial', app = tutorial.run:app """ ) - diff --git a/docs/tutorials/bfgwiki/src/models/tutorial/run.py b/docs/tutorials/bfgwiki/src/models/tutorial/run.py index b963f0aaa..748b13eef 100644 --- a/docs/tutorials/bfgwiki/src/models/tutorial/run.py +++ b/docs/tutorials/bfgwiki/src/models/tutorial/run.py @@ -1,19 +1,19 @@ -from repoze.bfg.router import make_app +from repoze.bfg.configuration import Configurator from repoze.zodbconn.finder import PersistentApplicationFinder +from tutorial.models import appmaker + def app(global_config, **settings): - """ This function returns a repoze.bfg.router.Router object. + """ This function returns a ``repoze.bfg`` WSGI application. It is usually called by the PasteDeploy framework during ``paster serve``. """ - # paster app config callback - import tutorial - from tutorial.models import appmaker zodb_uri = settings.get('zodb_uri') if zodb_uri is None: raise ValueError("No 'zodb_uri' in application configuration.") - finder = PersistentApplicationFinder(zodb_uri, appmaker) def get_root(request): return finder(request.environ) - return make_app(get_root, tutorial, settings=settings) + config = Configurator(root_factory=get_root, settings=settings) + config.load_zcml('configure.zcml') + return config.make_wsgi_app() diff --git a/docs/tutorials/bfgwiki/src/viewdecorators/CHANGES.txt b/docs/tutorials/bfgwiki/src/viewdecorators/CHANGES.txt index 1544cf53b..ffa255da8 100644 --- a/docs/tutorials/bfgwiki/src/viewdecorators/CHANGES.txt +++ b/docs/tutorials/bfgwiki/src/viewdecorators/CHANGES.txt @@ -1,3 +1,4 @@ -0.1 +0.0 +--- - Initial version +- Initial version diff --git a/docs/tutorials/bfgwiki/src/viewdecorators/setup.py b/docs/tutorials/bfgwiki/src/viewdecorators/setup.py index 76837aee1..35cf22893 100644 --- a/docs/tutorials/bfgwiki/src/viewdecorators/setup.py +++ b/docs/tutorials/bfgwiki/src/viewdecorators/setup.py @@ -15,22 +15,20 @@ requires = [ ] setup(name='tutorial', - version='0.1', + version='0.0', description='tutorial', long_description=README + '\n\n' + CHANGES, classifiers=[ - "Development Status :: 3 - Alpha", "Intended Audience :: Developers", + "Framework :: BFG", "Programming Language :: Python", "Topic :: Internet :: WWW/HTTP", - "Topic :: Internet :: WWW/HTTP :: Dynamic Content", - "Topic :: Internet :: WWW/HTTP :: WSGI", "Topic :: Internet :: WWW/HTTP :: WSGI :: Application", ], author='', author_email='', url='', - keywords='web wsgi bfg zope', + keywords='web wsgi bfg', packages=find_packages(), include_package_data=True, zip_safe=False, @@ -42,4 +40,3 @@ setup(name='tutorial', app = tutorial.run:app """ ) - diff --git a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py index b963f0aaa..748b13eef 100644 --- a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py +++ b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/run.py @@ -1,19 +1,19 @@ -from repoze.bfg.router import make_app +from repoze.bfg.configuration import Configurator from repoze.zodbconn.finder import PersistentApplicationFinder +from tutorial.models import appmaker + def app(global_config, **settings): - """ This function returns a repoze.bfg.router.Router object. + """ This function returns a ``repoze.bfg`` WSGI application. It is usually called by the PasteDeploy framework during ``paster serve``. """ - # paster app config callback - import tutorial - from tutorial.models import appmaker zodb_uri = settings.get('zodb_uri') if zodb_uri is None: raise ValueError("No 'zodb_uri' in application configuration.") - finder = PersistentApplicationFinder(zodb_uri, appmaker) def get_root(request): return finder(request.environ) - return make_app(get_root, tutorial, settings=settings) + config = Configurator(root_factory=get_root, settings=settings) + config.load_zcml('configure.zcml') + return config.make_wsgi_app() diff --git a/docs/tutorials/bfgwiki/src/views/setup.py b/docs/tutorials/bfgwiki/src/views/setup.py index 76837aee1..35cf22893 100644 --- a/docs/tutorials/bfgwiki/src/views/setup.py +++ b/docs/tutorials/bfgwiki/src/views/setup.py @@ -15,22 +15,20 @@ requires = [ ] setup(name='tutorial', - version='0.1', + version='0.0', description='tutorial', long_description=README + '\n\n' + CHANGES, classifiers=[ - "Development Status :: 3 - Alpha", "Intended Audience :: Developers", + "Framework :: BFG", "Programming Language :: Python", "Topic :: Internet :: WWW/HTTP", - "Topic :: Internet :: WWW/HTTP :: Dynamic Content", - "Topic :: Internet :: WWW/HTTP :: WSGI", "Topic :: Internet :: WWW/HTTP :: WSGI :: Application", ], author='', author_email='', url='', - keywords='web wsgi bfg zope', + keywords='web wsgi bfg', packages=find_packages(), include_package_data=True, zip_safe=False, @@ -42,4 +40,3 @@ setup(name='tutorial', app = tutorial.run:app """ ) - diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/run.py b/docs/tutorials/bfgwiki/src/views/tutorial/run.py index b963f0aaa..748b13eef 100644 --- a/docs/tutorials/bfgwiki/src/views/tutorial/run.py +++ b/docs/tutorials/bfgwiki/src/views/tutorial/run.py @@ -1,19 +1,19 @@ -from repoze.bfg.router import make_app +from repoze.bfg.configuration import Configurator from repoze.zodbconn.finder import PersistentApplicationFinder +from tutorial.models import appmaker + def app(global_config, **settings): - """ This function returns a repoze.bfg.router.Router object. + """ This function returns a ``repoze.bfg`` WSGI application. It is usually called by the PasteDeploy framework during ``paster serve``. """ - # paster app config callback - import tutorial - from tutorial.models import appmaker zodb_uri = settings.get('zodb_uri') if zodb_uri is None: raise ValueError("No 'zodb_uri' in application configuration.") - finder = PersistentApplicationFinder(zodb_uri, appmaker) def get_root(request): return finder(request.environ) - return make_app(get_root, tutorial, settings=settings) + config = Configurator(root_factory=get_root, settings=settings) + config.load_zcml('configure.zcml') + return config.make_wsgi_app() |