Michael Merickel
2011-08-21 9796459441b2f9a91e1712b60a19258990ee0b2f
refs
author Michael Merickel <michael@merickel.org>
Sunday, August 21, 2011 01:38 +0200
committer Michael Merickel <michael@merickel.org>
Sunday, August 21, 2011 01:38 +0200
commit9796459441b2f9a91e1712b60a19258990ee0b2f
tree 93122b29b0332d2c528f9202138ed028f0fed5fd tree | zip | gz
parent 534cb4b45264518b4929fd95cb5c9786ea42ba31 view | diff
1441407805178dda591db3a8ccd931d38baa7f4a view | diff
Merge branch 'master' into feature.dispatch-defaults

Conflicts:
pyramid/config.py
pyramid/tests/test_url.py
pyramid/url.py
pyramid/util.py
5 files deleted
25 files added
211 files modified
1 files renamed
21699 ■■■■■ changed files
CHANGES.txt 276 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 6 ●●●●● diff | view | raw | blame | history
LICENSE.txt 53 ●●●●● diff | view | raw | blame | history
RELEASING.txt 8 ●●●● diff | view | raw | blame | history
TODO.txt 62 ●●●●● diff | view | raw | blame | history
docs/api.rst 1 ●●●● diff | view | raw | blame | history
docs/api/config.rst 27 ●●●●● diff | view | raw | blame | history
docs/api/events.rst 9 ●●●●● diff | view | raw | blame | history
docs/api/interfaces.rst 8 ●●●●● diff | view | raw | blame | history
docs/api/renderers.rst 9 ●●●●● diff | view | raw | blame | history
docs/api/request.rst 19 ●●●●● diff | view | raw | blame | history
docs/api/response.rst 5 ●●●●● diff | view | raw | blame | history
docs/api/security.rst 2 ●●●●● diff | view | raw | blame | history
docs/api/tweens.rst 25 ●●●●● diff | view | raw | blame | history
docs/api/url.rst 4 ●●●● diff | view | raw | blame | history
docs/authorintro.rst 6 ●●●●● diff | view | raw | blame | history
docs/conf.py 2 ●●● diff | view | raw | blame | history
docs/copyright.rst 12 ●●●● diff | view | raw | blame | history
docs/designdefense.rst 2 ●●● diff | view | raw | blame | history
docs/glossary.rst 43 ●●●● diff | view | raw | blame | history
docs/index.rst 17 ●●●● diff | view | raw | blame | history
docs/latexindex.rst 16 ●●●●● diff | view | raw | blame | history
docs/make_book 2 ●●● diff | view | raw | blame | history
docs/make_epub 2 ●●●●● diff | view | raw | blame | history
docs/make_pdf 4 ●●●● diff | view | raw | blame | history
docs/narr/MyProject/development.ini 15 ●●●● diff | view | raw | blame | history
docs/narr/MyProject/myproject/templates/mytemplate.pt 14 ●●●● diff | view | raw | blame | history
docs/narr/MyProject/production.ini 26 ●●●● diff | view | raw | blame | history
docs/narr/MyProject/setup.py 2 ●●● diff | view | raw | blame | history
docs/narr/advconfig.rst 9 ●●●● diff | view | raw | blame | history
docs/narr/assets.rst 65 ●●●●● diff | view | raw | blame | history
docs/narr/commandline.rst 280 ●●●● diff | view | raw | blame | history
docs/narr/configuration.rst 26 ●●●●● diff | view | raw | blame | history
docs/narr/environment.rst 369 ●●●● diff | view | raw | blame | history
docs/narr/extending.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/firstapp.rst 32 ●●●● diff | view | raw | blame | history
docs/narr/hooks.rst 386 ●●●●● diff | view | raw | blame | history
docs/narr/hybrid.rst 13 ●●●●● diff | view | raw | blame | history
docs/narr/i18n.rst 41 ●●●● diff | view | raw | blame | history
docs/narr/install.rst 18 ●●●● diff | view | raw | blame | history
docs/narr/introduction.rst 5 ●●●●● diff | view | raw | blame | history
docs/narr/logging.rst 396 ●●●●● diff | view | raw | blame | history
docs/narr/muchadoabouttraversal.rst 15 ●●●● diff | view | raw | blame | history
docs/narr/project-debug.png diff | view | raw | blame | history
docs/narr/project.png diff | view | raw | blame | history
docs/narr/project.rst 118 ●●●● diff | view | raw | blame | history
docs/narr/renderers.rst 28 ●●●●● diff | view | raw | blame | history
docs/narr/resources.rst 110 ●●●●● diff | view | raw | blame | history
docs/narr/router.rst 1 ●●●● diff | view | raw | blame | history
docs/narr/security.rst 17 ●●●●● diff | view | raw | blame | history
docs/narr/sessions.rst 24 ●●●●● diff | view | raw | blame | history
docs/narr/startup.rst 26 ●●●●● diff | view | raw | blame | history
docs/narr/templates.rst 30 ●●●● diff | view | raw | blame | history
docs/narr/traversal.rst 101 ●●●●● diff | view | raw | blame | history
docs/narr/urldispatch.rst 242 ●●●●● diff | view | raw | blame | history
docs/narr/vhosting.rst 7 ●●●● diff | view | raw | blame | history
docs/narr/viewconfig.rst 158 ●●●● diff | view | raw | blame | history
docs/narr/views.rst 72 ●●●●● diff | view | raw | blame | history
docs/narr/webob.rst 19 ●●●●● diff | view | raw | blame | history
docs/narr/zca.rst 1 ●●●● diff | view | raw | blame | history
docs/tutorials/modwsgi/index.rst 3 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/authorization.rst 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/basiclayout.rst 55 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/definingmodels.rst 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/definingviews.rst 11 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/installation.rst 16 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/development.ini 26 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/production.ini 39 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/setup.py 7 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/__init__.py 17 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/login.py 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt 17 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/tests.py 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/views.py 15 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/development.ini 26 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/production.ini 39 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/setup.py 7 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py 15 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt 17 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/development.ini 26 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/production.ini 39 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/setup.py 7 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/__init__.py 15 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/static/pylons.css 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt 17 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/development.ini 26 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/production.ini 39 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/setup.py 7 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/__init__.py 17 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/login.py 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/static/pylons.css 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt 17 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/tests.py 16 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/tutorial/views.py 15 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/development.ini 26 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/production.ini 39 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/setup.py 7 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/__init__.py 15 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/static/pylons.css 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt 17 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/tests.py 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/views.py 15 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/authorization.rst 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/basiclayout.rst 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/definingviews.rst 6 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/installation.rst 6 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/development.ini 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/production.ini 34 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/setup.py 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/login.py 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/static/pylons.css 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt 17 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/views.py 23 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/development.ini 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/production.ini 34 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/setup.py 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/static/pylons.css 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt 17 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/development.ini 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/production.ini 34 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/setup.py 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/static/pylons.css 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt 17 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/development.ini 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/production.ini 34 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/setup.py 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/login.py 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/static/pylons.css 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/templates/mytemplate.pt 17 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/views.py 23 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/development.ini 21 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/production.ini 34 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/setup.py 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/static/pylons.css 4 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt 17 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/views.py 23 ●●●● diff | view | raw | blame | history
docs/whatsnew-1.0.rst 8 ●●●● diff | view | raw | blame | history
docs/whatsnew-1.1.rst 34 ●●●●● diff | view | raw | blame | history
pyramid/authentication.py 94 ●●●●● diff | view | raw | blame | history
pyramid/compat.py 8 ●●●●● diff | view | raw | blame | history
pyramid/compat/__init__.py 157 ●●●●● diff | view | raw | blame | history
pyramid/config.py 3357 ●●●●● diff | view | raw | blame | history
pyramid/config/__init__.py 802 ●●●●● diff | view | raw | blame | history
pyramid/config/adapters.py 60 ●●●●● diff | view | raw | blame | history
pyramid/config/assets.py 73 ●●●●● diff | view | raw | blame | history
pyramid/config/factories.py 64 ●●●●● diff | view | raw | blame | history
pyramid/config/i18n.py 105 ●●●●● diff | view | raw | blame | history
pyramid/config/rendering.py 90 ●●●●● diff | view | raw | blame | history
pyramid/config/routes.py 480 ●●●●● diff | view | raw | blame | history
pyramid/config/security.py 103 ●●●●● diff | view | raw | blame | history
pyramid/config/settings.py 48 ●●●●● diff | view | raw | blame | history
pyramid/config/testing.py 140 ●●●●● diff | view | raw | blame | history
pyramid/config/tweens.py 293 ●●●●● diff | view | raw | blame | history
pyramid/config/util.py 236 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 1381 ●●●●● diff | view | raw | blame | history
pyramid/config/zca.py 24 ●●●●● diff | view | raw | blame | history
pyramid/configuration.py 4 ●●● diff | view | raw | blame | history
pyramid/events.py 49 ●●●● diff | view | raw | blame | history
pyramid/httpexceptions.py 89 ●●●● diff | view | raw | blame | history
pyramid/interfaces.py 217 ●●●● diff | view | raw | blame | history
pyramid/log.py 16 ●●●●● diff | view | raw | blame | history
pyramid/mako_templating.py 22 ●●●●● diff | view | raw | blame | history
pyramid/paster.py 230 ●●●● diff | view | raw | blame | history
pyramid/renderers.py 76 ●●●● diff | view | raw | blame | history
pyramid/request.py 205 ●●●● diff | view | raw | blame | history
pyramid/response.py 59 ●●●●● diff | view | raw | blame | history
pyramid/router.py 252 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/__init__.py_tmpl 6 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/static/pylons.css 2 ●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/templates/model.pt_tmpl 18 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/templates/root.pt_tmpl 18 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/tests.py_tmpl 3 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/README.txt_tmpl 3 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/development.ini_tmpl 22 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/production.ini_tmpl 35 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/setup.py_tmpl 4 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/routesalchemy/+package+/models.py 2 ●●● diff | view | raw | blame | history
pyramid/scaffolds/routesalchemy/+package+/static/pylons.css 2 ●●● diff | view | raw | blame | history
pyramid/scaffolds/routesalchemy/+package+/templates/mytemplate.pt_tmpl 18 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/routesalchemy/README.txt_tmpl 3 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/routesalchemy/development.ini_tmpl 22 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/routesalchemy/production.ini_tmpl 35 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/routesalchemy/setup.py_tmpl 4 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/__init__.py_tmpl 1 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/static/pylons.css 2 ●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl 18 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/README.txt_tmpl 3 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/development.ini_tmpl 15 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/production.ini_tmpl 26 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/setup.py_tmpl 2 ●●● diff | view | raw | blame | history
pyramid/scaffolds/tests.py 43 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/__init__.py_tmpl 15 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/static/pylons.css 2 ●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl 18 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/tests.py_tmpl 1 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/README.txt_tmpl 3 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/development.ini_tmpl 27 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/production.ini_tmpl 38 ●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/setup.py_tmpl 7 ●●●●● diff | view | raw | blame | history
pyramid/security.py 2 ●●●●● diff | view | raw | blame | history
pyramid/session.py 5 ●●●● diff | view | raw | blame | history
pyramid/settings.py 57 ●●●●● diff | view | raw | blame | history
pyramid/static.py 3 ●●●● diff | view | raw | blame | history
pyramid/testing.py 13 ●●●●● diff | view | raw | blame | history
pyramid/tests/defpermbugapp/__init__.py 3 ●●●● diff | view | raw | blame | history
pyramid/tests/grokkedapp/__init__.py 34 ●●●●● diff | view | raw | blame | history
pyramid/tests/grokkedapp/another.py 24 ●●●●● diff | view | raw | blame | history
pyramid/tests/grokkedapp/pod/notinit.py 3 ●●●● diff | view | raw | blame | history
pyramid/tests/grokkedapp/subpackage/__init__.py 3 ●●●● diff | view | raw | blame | history
pyramid/tests/grokkedapp/subpackage/notinit.py 3 ●●●● diff | view | raw | blame | history
pyramid/tests/grokkedapp/subpackage/subsubpackage/__init__.py 3 ●●●● diff | view | raw | blame | history
pyramid/tests/permbugapp/__init__.py 4 ●●●● diff | view | raw | blame | history
pyramid/tests/test_authentication.py 143 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_compat.py 9 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/__init__.py 42 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_init.py 2662 ●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_tweens.py 382 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_util.py 258 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_views.py 1732 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_events.py 29 ●●●● diff | view | raw | blame | history
pyramid/tests/test_httpexceptions.py 10 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_log.py 16 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_mako_templating.py 26 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_paster.py 457 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_renderers.py 82 ●●●● diff | view | raw | blame | history
pyramid/tests/test_response.py 64 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_router.py 70 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_settings.py 318 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_static.py 4 ●●●● diff | view | raw | blame | history
pyramid/tests/test_testing.py 9 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_url.py 557 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_view.py 13 ●●●●● diff | view | raw | blame | history
pyramid/tweens.py 48 ●●●●● diff | view | raw | blame | history
pyramid/url.py 895 ●●●●● diff | view | raw | blame | history
pyramid/urldispatch.py 2 ●●●●● diff | view | raw | blame | history
pyramid/util.py 1 ●●●● diff | view | raw | blame | history
pyramid/view.py 3 ●●●● diff | view | raw | blame | history
pyramid/wsgi.py 2 ●●● diff | view | raw | blame | history
setup.py 5 ●●●●● diff | view | raw | blame | history
tox.ini 2 ●●● diff | view | raw | blame | history