From 40eb89e594ec6aefaeffb3db67493bdf0f9b6224 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 11 Nov 2010 13:40:44 -0500 Subject: - SQLAlchemy+urldispach wiki (``wiki2``) tutorial updated due to changes to ``pyramid_routesalchemy`` paster template. --- .../wiki2/src/authorization/development.ini | 11 +-- docs/tutorials/wiki2/src/authorization/setup.py | 8 +- .../wiki2/src/authorization/tutorial/__init__.py | 7 +- .../wiki2/src/authorization/tutorial/models.py | 3 +- .../authorization/tutorial/templates/mytemplate.pt | 104 +++++++++++---------- .../wiki2/src/basiclayout/development.ini | 10 +- docs/tutorials/wiki2/src/basiclayout/setup.py | 8 +- .../wiki2/src/basiclayout/tutorial/__init__.py | 11 +-- .../wiki2/src/basiclayout/tutorial/models.py | 3 +- .../basiclayout/tutorial/templates/mytemplate.pt | 104 +++++++++++---------- docs/tutorials/wiki2/src/models/development.ini | 10 +- docs/tutorials/wiki2/src/models/setup.py | 8 +- .../wiki2/src/models/tutorial/__init__.py | 7 +- docs/tutorials/wiki2/src/models/tutorial/models.py | 3 +- .../src/models/tutorial/templates/mytemplate.pt | 104 +++++++++++---------- docs/tutorials/wiki2/src/views/development.ini | 11 +-- docs/tutorials/wiki2/src/views/setup.py | 10 +- .../tutorials/wiki2/src/views/tutorial/__init__.py | 7 +- docs/tutorials/wiki2/src/views/tutorial/models.py | 3 +- .../src/views/tutorial/templates/mytemplate.pt | 104 +++++++++++---------- 20 files changed, 280 insertions(+), 256 deletions(-) (limited to 'docs/tutorials/wiki2/src') diff --git a/docs/tutorials/wiki2/src/authorization/development.ini b/docs/tutorials/wiki2/src/authorization/development.ini index 85f131c2e..e1d0ab598 100644 --- a/docs/tutorials/wiki2/src/authorization/development.ini +++ b/docs/tutorials/wiki2/src/authorization/development.ini @@ -1,8 +1,5 @@ -[DEFAULT] -debug = true - -[app:sqlalchemy] -use = egg:tutorial#app +[app:tutorial] +use = egg:tutorial reload_templates = true debug_authorization = false debug_notfound = false @@ -13,9 +10,9 @@ db_echo = false [pipeline:main] pipeline = - egg:Paste#evalerror + egg:WebError#evalerror egg:repoze.tm2#tm - sqlalchemy + tutorial [server:main] use = egg:Paste#http diff --git a/docs/tutorials/wiki2/src/authorization/setup.py b/docs/tutorials/wiki2/src/authorization/setup.py index 5dabb69a2..3be3146b7 100644 --- a/docs/tutorials/wiki2/src/authorization/setup.py +++ b/docs/tutorials/wiki2/src/authorization/setup.py @@ -13,6 +13,7 @@ requires = [ 'transaction', 'repoze.tm2', 'zope.sqlalchemy', + 'WebError', 'docutils' ] @@ -32,7 +33,7 @@ setup(name='tutorial', author='', author_email='', url='', - keywords='web wsgi pylons pyramid bfg', + keywords='web wsgi bfg pylons pyramid', packages=find_packages(), include_package_data=True, zip_safe=False, @@ -40,7 +41,8 @@ setup(name='tutorial', install_requires = requires, entry_points = """\ [paste.app_factory] - app = tutorial:app - """ + main = tutorial:main + """, + paster_plugins=['pyramid'], ) diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py index bfd3acc6a..4bddea74c 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py @@ -2,16 +2,13 @@ from pyramid.configuration import Configurator from pyramid.authentication import AuthTktAuthenticationPolicy from pyramid.authorization import ACLAuthorizationPolicy -from paste.deploy.converters import asbool +from pyramid.settings import asbool from tutorial.models import initialize_sql from tutorial.security import groupfinder -def app(global_config, **settings): +def main(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: diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/models.py b/docs/tutorials/wiki2/src/authorization/tutorial/models.py index a77b4964c..c914163bf 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/models.py +++ b/docs/tutorials/wiki2/src/authorization/tutorial/models.py @@ -16,8 +16,7 @@ from sqlalchemy.orm import sessionmaker from zope.sqlalchemy import ZopeTransactionExtension -DBSession = scoped_session(sessionmaker( - extension=ZopeTransactionExtension())) +DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension())) Base = declarative_base() class Page(Base): diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt index a5a0dd214..6ad23d44f 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt @@ -8,57 +8,67 @@ + - -
-
- -

- Welcome to ${project}, an application generated by
- the Pyramid web application development framework. -

+
+ -
-
-
-
-

Search Pyramid documentation

-
- - -
+
+
+ +

+ Welcome to ${project}, an application generated by
+ the Pyramid web application development framework. +

- +
+
+
+

Search Pyramid documentation

+
+ + +
+
+
diff --git a/docs/tutorials/wiki2/src/basiclayout/development.ini b/docs/tutorials/wiki2/src/basiclayout/development.ini index 73b5ed9a4..e1d0ab598 100644 --- a/docs/tutorials/wiki2/src/basiclayout/development.ini +++ b/docs/tutorials/wiki2/src/basiclayout/development.ini @@ -1,8 +1,5 @@ -[DEFAULT] -debug = true - -[app:sqlalchemy] -use = egg:tutorial#app +[app:tutorial] +use = egg:tutorial reload_templates = true debug_authorization = false debug_notfound = false @@ -13,8 +10,9 @@ db_echo = false [pipeline:main] pipeline = + egg:WebError#evalerror egg:repoze.tm2#tm - sqlalchemy + tutorial [server:main] use = egg:Paste#http diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py index 79b1a37c9..09764f40f 100644 --- a/docs/tutorials/wiki2/src/basiclayout/setup.py +++ b/docs/tutorials/wiki2/src/basiclayout/setup.py @@ -13,6 +13,7 @@ requires = [ 'transaction', 'repoze.tm2', 'zope.sqlalchemy', + 'WebError', ] if sys.version_info[:3] < (2,5,0): @@ -31,7 +32,7 @@ setup(name='tutorial', author='', author_email='', url='', - keywords='web wsgi pylons pyramid bfg', + keywords='web wsgi bfg pylons pyramid', packages=find_packages(), include_package_data=True, zip_safe=False, @@ -39,7 +40,8 @@ setup(name='tutorial', install_requires = requires, entry_points = """\ [paste.app_factory] - app = tutorial:app - """ + main = tutorial:main + """, + paster_plugins=['pyramid'], ) diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py index 7a947f1e1..7a701fc02 100644 --- a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py @@ -1,13 +1,10 @@ from pyramid.configuration import Configurator -from paste.deploy.converters import asbool +from pyramid.settings 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``. +def main(global_config, **settings): + """ This function returns a Pyramid WSGI application. """ db_string = settings.get('db_string') if db_string is None: @@ -21,3 +18,5 @@ def app(global_config, **settings): view_renderer='templates/mytemplate.pt') config.end() return config.make_wsgi_app() + + diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py index ae71e7943..a1726ebf4 100644 --- a/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py +++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py @@ -13,8 +13,7 @@ from sqlalchemy.orm import sessionmaker from zope.sqlalchemy import ZopeTransactionExtension -DBSession = scoped_session(sessionmaker( - extension=ZopeTransactionExtension())) +DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension())) Base = declarative_base() class MyModel(Base): diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt index a5a0dd214..6ad23d44f 100644 --- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt @@ -8,57 +8,67 @@ + - -
-
- -

- Welcome to ${project}, an application generated by
- the Pyramid web application development framework. -

+
+ -
-
-
-
-

Search Pyramid documentation

-
- - -
+
+
+ +

+ Welcome to ${project}, an application generated by
+ the Pyramid web application development framework. +

- +
+
+
+

Search Pyramid documentation

+
+ + +
+
+
diff --git a/docs/tutorials/wiki2/src/models/development.ini b/docs/tutorials/wiki2/src/models/development.ini index 73b5ed9a4..e1d0ab598 100644 --- a/docs/tutorials/wiki2/src/models/development.ini +++ b/docs/tutorials/wiki2/src/models/development.ini @@ -1,8 +1,5 @@ -[DEFAULT] -debug = true - -[app:sqlalchemy] -use = egg:tutorial#app +[app:tutorial] +use = egg:tutorial reload_templates = true debug_authorization = false debug_notfound = false @@ -13,8 +10,9 @@ db_echo = false [pipeline:main] pipeline = + egg:WebError#evalerror egg:repoze.tm2#tm - sqlalchemy + tutorial [server:main] use = egg:Paste#http diff --git a/docs/tutorials/wiki2/src/models/setup.py b/docs/tutorials/wiki2/src/models/setup.py index 79b1a37c9..09764f40f 100644 --- a/docs/tutorials/wiki2/src/models/setup.py +++ b/docs/tutorials/wiki2/src/models/setup.py @@ -13,6 +13,7 @@ requires = [ 'transaction', 'repoze.tm2', 'zope.sqlalchemy', + 'WebError', ] if sys.version_info[:3] < (2,5,0): @@ -31,7 +32,7 @@ setup(name='tutorial', author='', author_email='', url='', - keywords='web wsgi pylons pyramid bfg', + keywords='web wsgi bfg pylons pyramid', packages=find_packages(), include_package_data=True, zip_safe=False, @@ -39,7 +40,8 @@ setup(name='tutorial', install_requires = requires, entry_points = """\ [paste.app_factory] - app = tutorial:app - """ + main = tutorial:main + """, + paster_plugins=['pyramid'], ) diff --git a/docs/tutorials/wiki2/src/models/tutorial/__init__.py b/docs/tutorials/wiki2/src/models/tutorial/__init__.py index 7a947f1e1..10fcd0cbc 100644 --- a/docs/tutorials/wiki2/src/models/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/models/tutorial/__init__.py @@ -1,13 +1,10 @@ from pyramid.configuration import Configurator -from paste.deploy.converters import asbool +from pyramid.settings import asbool from tutorial.models import initialize_sql -def app(global_config, **settings): +def main(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: diff --git a/docs/tutorials/wiki2/src/models/tutorial/models.py b/docs/tutorials/wiki2/src/models/tutorial/models.py index 8c3f14915..ec9d2b25c 100644 --- a/docs/tutorials/wiki2/src/models/tutorial/models.py +++ b/docs/tutorials/wiki2/src/models/tutorial/models.py @@ -13,8 +13,7 @@ from sqlalchemy.orm import sessionmaker from zope.sqlalchemy import ZopeTransactionExtension -DBSession = scoped_session(sessionmaker( - extension=ZopeTransactionExtension())) +DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension())) Base = declarative_base() class Page(Base): diff --git a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt index a5a0dd214..6ad23d44f 100644 --- a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt @@ -8,57 +8,67 @@ + - -
-
- -

- Welcome to ${project}, an application generated by
- the Pyramid web application development framework. -

+
+ -
-
-
-
-

Search Pyramid documentation

-
- - -
+
+
+ +

+ Welcome to ${project}, an application generated by
+ the Pyramid web application development framework. +

- +
+
+
+

Search Pyramid documentation

+
+ + +
+
+
diff --git a/docs/tutorials/wiki2/src/views/development.ini b/docs/tutorials/wiki2/src/views/development.ini index 85f131c2e..e1d0ab598 100644 --- a/docs/tutorials/wiki2/src/views/development.ini +++ b/docs/tutorials/wiki2/src/views/development.ini @@ -1,8 +1,5 @@ -[DEFAULT] -debug = true - -[app:sqlalchemy] -use = egg:tutorial#app +[app:tutorial] +use = egg:tutorial reload_templates = true debug_authorization = false debug_notfound = false @@ -13,9 +10,9 @@ db_echo = false [pipeline:main] pipeline = - egg:Paste#evalerror + egg:WebError#evalerror egg:repoze.tm2#tm - sqlalchemy + tutorial [server:main] use = egg:Paste#http diff --git a/docs/tutorials/wiki2/src/views/setup.py b/docs/tutorials/wiki2/src/views/setup.py index 5dabb69a2..58f464f8c 100644 --- a/docs/tutorials/wiki2/src/views/setup.py +++ b/docs/tutorials/wiki2/src/views/setup.py @@ -13,7 +13,8 @@ requires = [ 'transaction', 'repoze.tm2', 'zope.sqlalchemy', - 'docutils' + 'WebError', + 'docutils', ] if sys.version_info[:3] < (2,5,0): @@ -32,7 +33,7 @@ setup(name='tutorial', author='', author_email='', url='', - keywords='web wsgi pylons pyramid bfg', + keywords='web wsgi bfg pylons pyramid', packages=find_packages(), include_package_data=True, zip_safe=False, @@ -40,7 +41,8 @@ setup(name='tutorial', install_requires = requires, entry_points = """\ [paste.app_factory] - app = tutorial:app - """ + main = tutorial:main + """, + paster_plugins=['pyramid'], ) diff --git a/docs/tutorials/wiki2/src/views/tutorial/__init__.py b/docs/tutorials/wiki2/src/views/tutorial/__init__.py index 4eeb1b6a9..9ef923e0b 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/views/tutorial/__init__.py @@ -1,13 +1,10 @@ from pyramid.configuration import Configurator -from paste.deploy.converters import asbool +from pyramid.settings import asbool from tutorial.models import initialize_sql -def app(global_config, **settings): +def main(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: diff --git a/docs/tutorials/wiki2/src/views/tutorial/models.py b/docs/tutorials/wiki2/src/views/tutorial/models.py index 8c3f14915..ec9d2b25c 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/models.py +++ b/docs/tutorials/wiki2/src/views/tutorial/models.py @@ -13,8 +13,7 @@ from sqlalchemy.orm import sessionmaker from zope.sqlalchemy import ZopeTransactionExtension -DBSession = scoped_session(sessionmaker( - extension=ZopeTransactionExtension())) +DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension())) Base = declarative_base() class Page(Base): diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt index a5a0dd214..6ad23d44f 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt @@ -8,57 +8,67 @@ + - -
-
- -

- Welcome to ${project}, an application generated by
- the Pyramid web application development framework. -

+
+ -
-
-
-
-

Search Pyramid documentation

-
- - -
+
+
+ +

+ Welcome to ${project}, an application generated by
+ the Pyramid web application development framework. +

- +
+
+
+

Search Pyramid documentation

+
+ + +
+
+
-- cgit v1.2.3