RedHatTraining/pyramid.git

Michael Merickel

2017-06-18 75c30dfe18b26ca04efae2acbe35052fa0d93ed6

refs
author	Michael Merickel <michael@merickel.org>
	Sunday, June 18, 2017 08:46 +0200
committer	Michael Merickel <michael@merickel.org>
	Sunday, June 18, 2017 08:46 +0200
commit	75c30dfe18b26ca04efae2acbe35052fa0d93ed6
tree	ebb57879035b60a801cd4deb113c4091956b67be tree \| zip \| gz
parent	4983421128e2e0fc92c771510f7b3af57de6d855 view \| diff 5c437abba0926f6093efbd481e49763de2436665 view \| diff

Merge branch 'master' into pr/3034

1 files added

148 files modified

	CHANGES.txt	80 ●●●●● diff \| view \| raw \| blame \| history
	CONTRIBUTORS.txt	8 ●●●●● diff \| view \| raw \| blame \| history
	README.rst	10 ●●●●● diff \| view \| raw \| blame \| history
	RELEASING.txt	20 ●●●●● diff \| view \| raw \| blame \| history
	contributing.md	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/security.rst	24 ●●●●● diff \| view \| raw \| blame \| history
	docs/conf.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/glossary.rst	33 ●●●●● diff \| view \| raw \| blame \| history
	docs/index.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/advanced-features.rst	330 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/install.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/introduction.rst	956 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/myproject/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/myproject/myproject/templates/layout.jinja2	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/myproject/setup.py	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/project.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/startup.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/testing.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour.rst	28 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/logging/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/logging/hello_world/templates/layout.jinja2	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/logging/setup.py	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/hello_world/templates/layout.jinja2	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/setup.py	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sessions/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sessions/hello_world/templates/layout.jinja2	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sessions/setup.py	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sqla_demo/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sqla_demo/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sqla_demo/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sqla_demo/sqla_demo/templates/layout.jinja2	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/cookiecutters.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/cookiecutters/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/unit_testing.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/modwsgi/index.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/authorization.rst	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/basiclayout.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/definingviews.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/installation.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/setup.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/tutorial/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/basiclayout/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/basiclayout/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/basiclayout/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/basiclayout/setup.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/installation/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/installation/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/installation/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/installation/setup.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/installation/tutorial/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/installation/tutorial/templates/mytemplate.pt	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/models/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/models/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/models/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/models/setup.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/models/tutorial/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/setup.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/tutorial/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/tutorial/templates/edit.pt	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/tutorial/templates/login.pt	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/tutorial/templates/view.pt	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/views/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/views/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/views/setup.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/views/tutorial/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/views/tutorial/templates/edit.pt	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/views/tutorial/templates/view.pt	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/authentication.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/installation.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authentication/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authentication/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authentication/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authentication/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authentication/tutorial/models/__init__.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authentication/tutorial/templates/layout.jinja2	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authorization/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authorization/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authorization/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authorization/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authorization/tutorial/models/__init__.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authorization/tutorial/templates/layout.jinja2	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/basiclayout/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/basiclayout/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/basiclayout/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/basiclayout/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/basiclayout/tutorial/models/__init__.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/basiclayout/tutorial/templates/layout.jinja2	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/installation/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/installation/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/installation/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/installation/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/installation/tutorial/models/__init__.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/installation/tutorial/templates/layout.jinja2	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/tutorial/models/__init__.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/tutorial/templates/layout.jinja2	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/tutorial/models/__init__.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/tutorial/templates/layout.jinja2	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/development.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/tutorial/models/__init__.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/tutorial/templates/layout.jinja2	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/whatsnew-1.9.rst	28 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/authentication.py	10 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/util.py	17 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/encode.py	45 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/interfaces.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/router.py	43 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/alchemy/+package+/models/__init__.py_tmpl	1 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/alchemy/+package+/templates/layout.jinja2_tmpl	10 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/alchemy/development.ini_tmpl	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl	10 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/starter/development.ini_tmpl	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/zodb/+package+/__init__.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl	10 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/zodb/development.ini_tmpl	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/security.py	114 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_util.py	10 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_encode.py	11 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_router.py	27 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_scaffolds/fixture_scaffold/+package+/templates/mytemplate.pt_tmpl	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_security.py	28 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_view.py	46 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/threadlocal.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/view.py	67 ●●●●● diff \| view \| raw \| blame \| history
	setup.py	2 ●●●●● diff \| view \| raw \| blame \| history