From b2adfe7c10bff8edd06a76df3c638768e30b6bc3 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 4 Nov 2010 03:35:53 -0400 Subject: - The SQL Wiki tutorial was updated to take into account changes to the ``pyramid_routesalchemy`` paster template. --- docs/tutorials/wiki2/src/views/development.ini | 23 +++++++++++++ docs/tutorials/wiki2/src/views/setup.py | 2 +- docs/tutorials/wiki2/src/views/tutorial.ini | 23 ------------- .../tutorials/wiki2/src/views/tutorial/__init__.py | 32 +++++++++++++++++- .../wiki2/src/views/tutorial/configure.zcml | 38 ---------------------- docs/tutorials/wiki2/src/views/tutorial/run.py | 24 -------------- 6 files changed, 55 insertions(+), 87 deletions(-) create mode 100644 docs/tutorials/wiki2/src/views/development.ini delete mode 100644 docs/tutorials/wiki2/src/views/tutorial.ini delete mode 100644 docs/tutorials/wiki2/src/views/tutorial/configure.zcml delete mode 100644 docs/tutorials/wiki2/src/views/tutorial/run.py (limited to 'docs/tutorials/wiki2/src/views') diff --git a/docs/tutorials/wiki2/src/views/development.ini b/docs/tutorials/wiki2/src/views/development.ini new file mode 100644 index 000000000..85f131c2e --- /dev/null +++ b/docs/tutorials/wiki2/src/views/development.ini @@ -0,0 +1,23 @@ +[DEFAULT] +debug = true + +[app:sqlalchemy] +use = egg:tutorial#app +reload_templates = true +debug_authorization = false +debug_notfound = false +debug_templates = true +default_locale_name = en +db_string = sqlite:///%(here)s/tutorial.db +db_echo = false + +[pipeline:main] +pipeline = + egg:Paste#evalerror + egg:repoze.tm2#tm + sqlalchemy + +[server:main] +use = egg:Paste#http +host = 0.0.0.0 +port = 6543 diff --git a/docs/tutorials/wiki2/src/views/setup.py b/docs/tutorials/wiki2/src/views/setup.py index eeac5c397..5dabb69a2 100644 --- a/docs/tutorials/wiki2/src/views/setup.py +++ b/docs/tutorials/wiki2/src/views/setup.py @@ -40,7 +40,7 @@ setup(name='tutorial', install_requires = requires, entry_points = """\ [paste.app_factory] - app = tutorial.run:app + app = tutorial:app """ ) diff --git a/docs/tutorials/wiki2/src/views/tutorial.ini b/docs/tutorials/wiki2/src/views/tutorial.ini deleted file mode 100644 index 85f131c2e..000000000 --- a/docs/tutorials/wiki2/src/views/tutorial.ini +++ /dev/null @@ -1,23 +0,0 @@ -[DEFAULT] -debug = true - -[app:sqlalchemy] -use = egg:tutorial#app -reload_templates = true -debug_authorization = false -debug_notfound = false -debug_templates = true -default_locale_name = en -db_string = sqlite:///%(here)s/tutorial.db -db_echo = false - -[pipeline:main] -pipeline = - egg:Paste#evalerror - egg:repoze.tm2#tm - sqlalchemy - -[server:main] -use = egg:Paste#http -host = 0.0.0.0 -port = 6543 diff --git a/docs/tutorials/wiki2/src/views/tutorial/__init__.py b/docs/tutorials/wiki2/src/views/tutorial/__init__.py index cbdfd3ac6..2d00cccc2 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/views/tutorial/__init__.py @@ -1,2 +1,32 @@ -# A package +from pyramid.configuration import Configurator +from paste.deploy.converters import asbool + +from tutorial.models import initialize_sql + +def app(global_config, **settings): + """ This function returns a WSGI application. + + It is usually called by the PasteDeploy framework during + ``paster serve``. + """ + db_string = settings.get('db_string') + if db_string is None: + raise ValueError("No 'db_string' value in application configuration.") + 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', 'templates/static') + config.add_route('home', '/', view='tutorial.views.view_wiki') + config.add_route('view_page', '/:pagename', + view='tutorial.views.view_page', + view_renderer='tutorial:templates/view.pt') + config.add_route('add_page', '/add_page/:pagename', + view='tutorial.views.add_page', + view_renderer='tutorial:templates/view.pt') + 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() diff --git a/docs/tutorials/wiki2/src/views/tutorial/configure.zcml b/docs/tutorials/wiki2/src/views/tutorial/configure.zcml deleted file mode 100644 index 3a2e13a7a..000000000 --- a/docs/tutorials/wiki2/src/views/tutorial/configure.zcml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/docs/tutorials/wiki2/src/views/tutorial/run.py b/docs/tutorials/wiki2/src/views/tutorial/run.py deleted file mode 100644 index 7225987ee..000000000 --- a/docs/tutorials/wiki2/src/views/tutorial/run.py +++ /dev/null @@ -1,24 +0,0 @@ -from pyramid.configuration import Configurator -from paste.deploy.converters import asbool - -from tutorial.models import initialize_sql - -def app(global_config, **settings): - """ This function returns a WSGI application. - - It is usually called by the PasteDeploy framework during - ``paster serve``. - """ - zcml_file = settings.get('configure_zcml', 'configure.zcml') - db_string = settings.get('db_string') - if db_string is None: - raise ValueError( - "No 'db_string' value in application configuration.") - db_echo = settings.get('db_echo', 'false') - initialize_sql(db_string, asbool(db_echo)) - config = Configurator(settings=settings) - config.begin() - config.load_zcml(zcml_file) - config.end() - return config.make_wsgi_app() - -- cgit v1.2.3