RedHatTraining/pyramid.git

Merge branch 'master' of github.com:Pylons/pyramid

Chris McDonough

2015-04-02 45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f

refs
author	Chris McDonough <chrism@plope.com>
	Thursday, April 2, 2015 19:57 +0200
committer	Chris McDonough <chrism@plope.com>
	Thursday, April 2, 2015 19:57 +0200
commit	45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f
tree	9efe59281dbc0b20b9a94b69ee0a18bcb124aa93 tree \| zip \| gz
parent	b6498fce8c1418f3c7b33d31aa9c151a86bc4166 view \| diff 575ff8050b0cbdbf424947361f419b803568e122 view \| diff

Merge branch 'master' of github.com:Pylons/pyramid

2 files deleted

10 files added

131 files modified

	.gitignore	4 ●●●●● diff \| view \| raw \| blame \| history
	.travis.yml	24 ●●●●● diff \| view \| raw \| blame \| history
	CHANGES.txt	184 ●●●●● diff \| view \| raw \| blame \| history
	CONTRIBUTORS.txt	14 ●●●●● diff \| view \| raw \| blame \| history
	HACKING.txt	5 ●●●●● diff \| view \| raw \| blame \| history
	HISTORY.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	README.rst	11 ●●●●● diff \| view \| raw \| blame \| history
	RELEASING.txt	3 ●●●●● diff \| view \| raw \| blame \| history
	TODO.txt	5 ●●●●● diff \| view \| raw \| blame \| history
	docs/_static/pyramid_request_processing.graffle	9748 ●●●●● diff \| view \| raw \| blame \| history
	docs/_static/pyramid_request_processing.png	diff \| view \| raw \| blame \| history
	docs/_static/pyramid_request_processing.svg	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/_static/pyramid_router.graffle	1621 ●●●●● diff \| view \| raw \| blame \| history
	docs/_static/pyramid_router.png	diff \| view \| raw \| blame \| history
	docs/_static/pyramid_router.svg	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/_themes @ 382cba	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/config.rst	5 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/exceptions.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/httpexceptions.rst	94 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/index.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/interfaces.rst	5 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/registry.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/request.rst	42 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/security.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/static.rst	14 ●●●●● diff \| view \| raw \| blame \| history
	docs/conf.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/glossary.rst	37 ●●●●● diff \| view \| raw \| blame \| history
	docs/index.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/MyProject/myproject/tests.py	37 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/MyProject/setup.py	45 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/assets.rst	244 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/commandline.rst	56 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/configuration.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/environment.rst	170 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/extconfig.rst	104 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/hooks.rst	51 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/hybrid.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/i18n.rst	18 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/introspector.rst	16 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/logging.rst	68 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/router.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/security.rst	154 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/sessions.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/startup.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/templates.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/testing.rst	136 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/urldispatch.rst	62 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/viewconfig.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/webob.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/debugtoolbar.rst	46 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/forms.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/functional_testing.rst	7 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/hello_world.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/ini.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/jinja2.rst	13 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/jinja2/tutorial/tests.py	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/logging.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/more_view_classes/tutorial/views.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/authorization.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/design.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/design.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/authentication.py	29 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/compat.py	113 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/__init__.py	135 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/adapters.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/assets.py	220 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/factories.py	52 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/routes.py	31 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/settings.py	9 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/util.py	3 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/views.py	163 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/decorator.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/httpexceptions.py	69 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/i18n.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/interfaces.py	134 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/path.py	10 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/registry.py	5 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/renderers.py	113 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/request.py	52 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/response.py	17 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/router.py	3 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/alchemy/development.ini_tmpl	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/alchemy/production.ini_tmpl	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/starter/development.ini_tmpl	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/starter/production.ini_tmpl	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/tests.py	4 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/zodb/development.ini_tmpl	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/zodb/production.ini_tmpl	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scripting.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scripts/pcreate.py	15 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scripts/prequest.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scripts/proutes.py	380 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scripts/pserve.py	37 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scripts/pshell.py	9 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/security.py	39 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/session.py	4 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/static.py	134 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/testing.py	12 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_authentication.py	16 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_compat.py	26 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/pkgs/asset/models.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/pkgs/asset/subpackage/templates/bar.pt	diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/pkgs/asset/views.py	22 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_adapters.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_assets.py	487 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_factories.py	34 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_init.py	91 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_settings.py	31 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_util.py	7 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_views.py	190 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_decorator.py	18 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_integration.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_path.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_registry.py	5 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_renderers.py	91 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_request.py	93 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_response.py	28 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_router.py	22 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_scripting.py	16 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_scripts/dummy.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_scripts/pystartup.txt	3 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_scripts/test_pcreate.py	28 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_scripts/test_prequest.py	13 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_scripts/test_proutes.py	620 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_scripts/test_pserve.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_scripts/test_pshell.py	23 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_security.py	21 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_session.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_static.py	163 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_testing.py	6 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_traversal.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_urldispatch.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_util.py	301 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/traversal.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/url.py	4 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/urldispatch.py	13 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/util.py	126 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/view.py	32 ●●●●● diff \| view \| raw \| blame \| history
	rtd.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	setup.cfg	2 ●●●●● diff \| view \| raw \| blame \| history
	setup.py	4 ●●●●● diff \| view \| raw \| blame \| history
	tox.ini	73 ●●●●● diff \| view \| raw \| blame \| history