From 2a5ae0346df95e5b4f9a7d8531574dce70abe31f Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 22 Dec 2010 22:34:20 -0500 Subject: - The ``pyramid_zodb`` Paster template no longer employs ZCML. Instead, it is based on scanning. - Changed the "ZODB + Traversal Wiki Tutorial" based on changes to ``pyramid_zodb`` Paster template. --- docs/tutorials/wiki/src/basiclayout/CHANGES.txt | 2 +- .../tutorials/wiki/src/basiclayout/development.ini | 29 ++++++ docs/tutorials/wiki/src/basiclayout/setup.cfg | 1 - docs/tutorials/wiki/src/basiclayout/setup.py | 8 +- .../wiki/src/basiclayout/tutorial/__init__.py | 4 +- .../wiki/src/basiclayout/tutorial/configure.zcml | 17 ---- .../basiclayout/tutorial/templates/mytemplate.pt | 104 +++++++++++---------- .../wiki/src/basiclayout/tutorial/tests.py | 1 + .../wiki/src/basiclayout/tutorial/views.py | 4 + 9 files changed, 98 insertions(+), 72 deletions(-) delete mode 100644 docs/tutorials/wiki/src/basiclayout/tutorial/configure.zcml (limited to 'docs/tutorials/wiki/src/basiclayout') diff --git a/docs/tutorials/wiki/src/basiclayout/CHANGES.txt b/docs/tutorials/wiki/src/basiclayout/CHANGES.txt index ffa255da8..35a34f332 100644 --- a/docs/tutorials/wiki/src/basiclayout/CHANGES.txt +++ b/docs/tutorials/wiki/src/basiclayout/CHANGES.txt @@ -1,4 +1,4 @@ 0.0 --- -- Initial version +- Initial version diff --git a/docs/tutorials/wiki/src/basiclayout/development.ini b/docs/tutorials/wiki/src/basiclayout/development.ini index fdae922e9..6f4c33d93 100644 --- a/docs/tutorials/wiki/src/basiclayout/development.ini +++ b/docs/tutorials/wiki/src/basiclayout/development.ini @@ -4,10 +4,13 @@ reload_templates = true debug_authorization = false debug_notfound = false debug_routematch = false +debug_templates = true +default_locale_name = en zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000 [pipeline:main] pipeline = + egg:WebError#evalerror egg:repoze.zodbconn#closer egg:repoze.tm#tm tutorial @@ -16,3 +19,29 @@ pipeline = use = egg:Paste#http host = 0.0.0.0 port = 6543 + +# Begin logging configuration + +[loggers] +keys = root + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = INFO +handlers = console + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s + +# End logging configuration diff --git a/docs/tutorials/wiki/src/basiclayout/setup.cfg b/docs/tutorials/wiki/src/basiclayout/setup.cfg index 3d7ea6e23..23b2ad983 100644 --- a/docs/tutorials/wiki/src/basiclayout/setup.cfg +++ b/docs/tutorials/wiki/src/basiclayout/setup.cfg @@ -25,4 +25,3 @@ domain = tutorial input_file = tutorial/locale/tutorial.pot output_dir = tutorial/locale previous = true - diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py index a0de6ec81..7fb15b782 100644 --- a/docs/tutorials/wiki/src/basiclayout/setup.py +++ b/docs/tutorials/wiki/src/basiclayout/setup.py @@ -19,9 +19,8 @@ setup(name='tutorial', description='tutorial', long_description=README + '\n\n' + CHANGES, classifiers=[ - "Intended Audience :: Developers", - "Framework :: Pylons", "Programming Language :: Python", + "Framework :: Pylons", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: WSGI :: Application", ], @@ -32,8 +31,8 @@ setup(name='tutorial', packages=find_packages(), include_package_data=True, zip_safe=False, - install_requires=requires, - tests_require=requires, + install_requires = requires, + tests_require= requires, test_suite="tutorial", entry_points = """\ [paste.app_factory] @@ -41,3 +40,4 @@ setup(name='tutorial', """, paster_plugins=['pyramid'], ) + diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py index 8325865c0..a9f776980 100644 --- a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py +++ b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py @@ -13,6 +13,6 @@ def main(global_config, **settings): def get_root(request): return finder(request.environ) config = Configurator(root_factory=get_root, settings=settings) - config.load_zcml('configure.zcml') + config.add_static_view('static', 'tutorial:static') + config.scan('tutorial') return config.make_wsgi_app() - diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/configure.zcml b/docs/tutorials/wiki/src/basiclayout/tutorial/configure.zcml deleted file mode 100644 index ab7fd6fbe..000000000 --- a/docs/tutorials/wiki/src/basiclayout/tutorial/configure.zcml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt index a5a0dd214..6ad23d44f 100644 --- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/wiki/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/wiki/src/basiclayout/tutorial/tests.py b/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py index 26ee6671e..0a3d507a0 100644 --- a/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py +++ b/docs/tutorials/wiki/src/basiclayout/tutorial/tests.py @@ -16,3 +16,4 @@ class ViewTests(unittest.TestCase): request = testing.DummyRequest() info = my_view(request) self.assertEqual(info['project'], 'tutorial') + diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/views.py b/docs/tutorials/wiki/src/basiclayout/tutorial/views.py index 93d619d83..555f49e6d 100644 --- a/docs/tutorials/wiki/src/basiclayout/tutorial/views.py +++ b/docs/tutorials/wiki/src/basiclayout/tutorial/views.py @@ -1,2 +1,6 @@ +from pyramid.view import view_config +from tutorial.models import MyModel + +@view_config(context=MyModel, renderer='tutorial:templates/mytemplate.pt') def my_view(request): return {'project':'tutorial'} -- cgit v1.2.3