300 files changed, 0 insertions, 0 deletions

diff --git a/pyramid/__init__.py b/src/pyramid/__init__.py
index 5bb534f79..5bb534f79 100644
--- a/pyramid/__init__.py
+++ b/src/pyramid/__init__.py
diff --git a/pyramid/asset.py b/src/pyramid/asset.py
index 9d7a3ee63..9d7a3ee63 100644
--- a/pyramid/asset.py
+++ b/src/pyramid/asset.py
diff --git a/pyramid/authentication.py b/src/pyramid/authentication.py
index a9604e336..a9604e336 100644
--- a/pyramid/authentication.py
+++ b/src/pyramid/authentication.py
diff --git a/pyramid/authorization.py b/src/pyramid/authorization.py
index 4845762ef..4845762ef 100644
--- a/pyramid/authorization.py
+++ b/src/pyramid/authorization.py
diff --git a/pyramid/compat.py b/src/pyramid/compat.py
index a7f9c1287..a7f9c1287 100644
--- a/pyramid/compat.py
+++ b/src/pyramid/compat.py
diff --git a/pyramid/config/__init__.py b/src/pyramid/config/__init__.py
index 2f4e133f0..2f4e133f0 100644
--- a/pyramid/config/__init__.py
+++ b/src/pyramid/config/__init__.py
diff --git a/pyramid/config/adapters.py b/src/pyramid/config/adapters.py
index 945faa3c6..945faa3c6 100644
--- a/pyramid/config/adapters.py
+++ b/src/pyramid/config/adapters.py
diff --git a/pyramid/config/assets.py b/src/pyramid/config/assets.py
index b9536df42..b9536df42 100644
--- a/pyramid/config/assets.py
+++ b/src/pyramid/config/assets.py
diff --git a/pyramid/config/factories.py b/src/pyramid/config/factories.py
index 52248269d..52248269d 100644
--- a/pyramid/config/factories.py
+++ b/src/pyramid/config/factories.py
diff --git a/pyramid/config/i18n.py b/src/pyramid/config/i18n.py
index 5dabe2845..5dabe2845 100644
--- a/pyramid/config/i18n.py
+++ b/src/pyramid/config/i18n.py
diff --git a/pyramid/config/predicates.py b/src/pyramid/config/predicates.py
index bda763161..bda763161 100644
--- a/pyramid/config/predicates.py
+++ b/src/pyramid/config/predicates.py
diff --git a/pyramid/config/rendering.py b/src/pyramid/config/rendering.py
index 0d55c41e8..0d55c41e8 100644
--- a/pyramid/config/rendering.py
+++ b/src/pyramid/config/rendering.py
diff --git a/pyramid/config/routes.py b/src/pyramid/config/routes.py
index 5d05429a7..5d05429a7 100644
--- a/pyramid/config/routes.py
+++ b/src/pyramid/config/routes.py
diff --git a/pyramid/config/security.py b/src/pyramid/config/security.py
index c7afbcf4e..c7afbcf4e 100644
--- a/pyramid/config/security.py
+++ b/src/pyramid/config/security.py
diff --git a/pyramid/config/settings.py b/src/pyramid/config/settings.py
index 11a1f7d8c..11a1f7d8c 100644
--- a/pyramid/config/settings.py
+++ b/src/pyramid/config/settings.py
diff --git a/pyramid/config/testing.py b/src/pyramid/config/testing.py
index 1daf5cdeb..1daf5cdeb 100644
--- a/pyramid/config/testing.py
+++ b/src/pyramid/config/testing.py
diff --git a/pyramid/config/tweens.py b/src/pyramid/config/tweens.py
index 8bf21cf71..8bf21cf71 100644
--- a/pyramid/config/tweens.py
+++ b/src/pyramid/config/tweens.py
diff --git a/pyramid/config/util.py b/src/pyramid/config/util.py
index 05d810f6f..05d810f6f 100644
--- a/pyramid/config/util.py
+++ b/src/pyramid/config/util.py
diff --git a/pyramid/config/views.py b/src/pyramid/config/views.py
index e6baa7c17..e6baa7c17 100644
--- a/pyramid/config/views.py
+++ b/src/pyramid/config/views.py
diff --git a/pyramid/config/zca.py b/src/pyramid/config/zca.py
index bcd5c31e3..bcd5c31e3 100644
--- a/pyramid/config/zca.py
+++ b/src/pyramid/config/zca.py
diff --git a/pyramid/csrf.py b/src/pyramid/csrf.py
index da171d9af..da171d9af 100644
--- a/pyramid/csrf.py
+++ b/src/pyramid/csrf.py
diff --git a/pyramid/decorator.py b/src/pyramid/decorator.py
index 065a3feed..065a3feed 100644
--- a/pyramid/decorator.py
+++ b/src/pyramid/decorator.py
diff --git a/pyramid/encode.py b/src/pyramid/encode.py
index 73ff14e62..73ff14e62 100644
--- a/pyramid/encode.py
+++ b/src/pyramid/encode.py
diff --git a/pyramid/events.py b/src/pyramid/events.py
index 93fc127a1..93fc127a1 100644
--- a/pyramid/events.py
+++ b/src/pyramid/events.py
diff --git a/pyramid/exceptions.py b/src/pyramid/exceptions.py
index c95922eb0..c95922eb0 100644
--- a/pyramid/exceptions.py
+++ b/src/pyramid/exceptions.py
diff --git a/pyramid/httpexceptions.py b/src/pyramid/httpexceptions.py
index bef8420b1..bef8420b1 100644
--- a/pyramid/httpexceptions.py
+++ b/src/pyramid/httpexceptions.py
diff --git a/pyramid/i18n.py b/src/pyramid/i18n.py
index 1d11adfe3..1d11adfe3 100644
--- a/pyramid/i18n.py
+++ b/src/pyramid/i18n.py
diff --git a/pyramid/interfaces.py b/src/pyramid/interfaces.py
index 4df5593f8..4df5593f8 100644
--- a/pyramid/interfaces.py
+++ b/src/pyramid/interfaces.py
diff --git a/pyramid/location.py b/src/pyramid/location.py
index 4124895a5..4124895a5 100644
--- a/pyramid/location.py
+++ b/src/pyramid/location.py
diff --git a/pyramid/paster.py b/src/pyramid/paster.py
index f7544f0c5..f7544f0c5 100644
--- a/pyramid/paster.py
+++ b/src/pyramid/paster.py
diff --git a/pyramid/path.py b/src/pyramid/path.py
index 3fac7e940..3fac7e940 100644
--- a/pyramid/path.py
+++ b/src/pyramid/path.py
diff --git a/pyramid/predicates.py b/src/pyramid/predicates.py
index 97edae8a0..97edae8a0 100644
--- a/pyramid/predicates.py
+++ b/src/pyramid/predicates.py
diff --git a/pyramid/registry.py b/src/pyramid/registry.py
index a741c495e..a741c495e 100644
--- a/pyramid/registry.py
+++ b/src/pyramid/registry.py
diff --git a/pyramid/renderers.py b/src/pyramid/renderers.py
index d1c85b371..d1c85b371 100644
--- a/pyramid/renderers.py
+++ b/src/pyramid/renderers.py
diff --git a/pyramid/request.py b/src/pyramid/request.py
index 201f1d648..201f1d648 100644
--- a/pyramid/request.py
+++ b/src/pyramid/request.py
diff --git a/pyramid/resource.py b/src/pyramid/resource.py
index 986c75e37..986c75e37 100644
--- a/pyramid/resource.py
+++ b/src/pyramid/resource.py
diff --git a/pyramid/response.py b/src/pyramid/response.py
index 1e2546ed0..1e2546ed0 100644
--- a/pyramid/response.py
+++ b/src/pyramid/response.py
diff --git a/pyramid/router.py b/src/pyramid/router.py
index 49b7b601b..49b7b601b 100644
--- a/pyramid/router.py
+++ b/src/pyramid/router.py
diff --git a/pyramid/scaffolds/__init__.py b/src/pyramid/scaffolds/__init__.py
index 71a220e22..71a220e22 100644
--- a/pyramid/scaffolds/__init__.py
+++ b/src/pyramid/scaffolds/__init__.py
diff --git a/pyramid/scaffolds/alchemy/+dot+coveragerc_tmpl b/src/pyramid/scaffolds/alchemy/+dot+coveragerc_tmpl
index 273a4a580..273a4a580 100644
--- a/pyramid/scaffolds/alchemy/+dot+coveragerc_tmpl
+++ b/src/pyramid/scaffolds/alchemy/+dot+coveragerc_tmpl
diff --git a/pyramid/scaffolds/alchemy/+package+/__init__.py b/src/pyramid/scaffolds/alchemy/+package+/__init__.py
index 4dab44823..4dab44823 100644
--- a/pyramid/scaffolds/alchemy/+package+/__init__.py
+++ b/src/pyramid/scaffolds/alchemy/+package+/__init__.py
diff --git a/pyramid/scaffolds/alchemy/+package+/models/__init__.py_tmpl b/src/pyramid/scaffolds/alchemy/+package+/models/__init__.py_tmpl
index 521816ce7..521816ce7 100644
--- a/pyramid/scaffolds/alchemy/+package+/models/__init__.py_tmpl
+++ b/src/pyramid/scaffolds/alchemy/+package+/models/__init__.py_tmpl
diff --git a/pyramid/scaffolds/alchemy/+package+/models/meta.py b/src/pyramid/scaffolds/alchemy/+package+/models/meta.py
index 0682247b5..0682247b5 100644
--- a/pyramid/scaffolds/alchemy/+package+/models/meta.py
+++ b/src/pyramid/scaffolds/alchemy/+package+/models/meta.py
diff --git a/pyramid/scaffolds/alchemy/+package+/models/mymodel.py b/src/pyramid/scaffolds/alchemy/+package+/models/mymodel.py
index d65a01a42..d65a01a42 100644
--- a/pyramid/scaffolds/alchemy/+package+/models/mymodel.py
+++ b/src/pyramid/scaffolds/alchemy/+package+/models/mymodel.py
diff --git a/pyramid/scaffolds/alchemy/+package+/routes.py b/src/pyramid/scaffolds/alchemy/+package+/routes.py
index 25504ad4d..25504ad4d 100644
--- a/pyramid/scaffolds/alchemy/+package+/routes.py
+++ b/src/pyramid/scaffolds/alchemy/+package+/routes.py
diff --git a/pyramid/scaffolds/alchemy/+package+/scripts/__init__.py b/src/pyramid/scaffolds/alchemy/+package+/scripts/__init__.py
index 5bb534f79..5bb534f79 100644
--- a/pyramid/scaffolds/alchemy/+package+/scripts/__init__.py
+++ b/src/pyramid/scaffolds/alchemy/+package+/scripts/__init__.py
diff --git a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py b/src/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
index 7307ecc5c..7307ecc5c 100644
--- a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
+++ b/src/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
diff --git a/pyramid/scaffolds/alchemy/+package+/static/pyramid-16x16.png b/src/pyramid/scaffolds/alchemy/+package+/static/pyramid-16x16.png
index 979203112..979203112 100644
--- a/pyramid/scaffolds/alchemy/+package+/static/pyramid-16x16.png
+++ b/src/pyramid/scaffolds/alchemy/+package+/static/pyramid-16x16.png
diff --git a/pyramid/scaffolds/alchemy/+package+/static/pyramid.png b/src/pyramid/scaffolds/alchemy/+package+/static/pyramid.png
index 4ab837be9..4ab837be9 100644
--- a/pyramid/scaffolds/alchemy/+package+/static/pyramid.png
+++ b/src/pyramid/scaffolds/alchemy/+package+/static/pyramid.png
diff --git a/pyramid/scaffolds/alchemy/+package+/static/theme.css b/src/pyramid/scaffolds/alchemy/+package+/static/theme.css
index 0f4b1a4d4..0f4b1a4d4 100644
--- a/pyramid/scaffolds/alchemy/+package+/static/theme.css
+++ b/src/pyramid/scaffolds/alchemy/+package+/static/theme.css
diff --git a/pyramid/scaffolds/alchemy/+package+/templates/404.jinja2_tmpl b/src/pyramid/scaffolds/alchemy/+package+/templates/404.jinja2_tmpl
index 1917f83c7..1917f83c7 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/404.jinja2_tmpl
+++ b/src/pyramid/scaffolds/alchemy/+package+/templates/404.jinja2_tmpl
diff --git a/pyramid/scaffolds/alchemy/+package+/templates/layout.jinja2_tmpl b/src/pyramid/scaffolds/alchemy/+package+/templates/layout.jinja2_tmpl
index d6b3ca9c6..d6b3ca9c6 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/layout.jinja2_tmpl
+++ b/src/pyramid/scaffolds/alchemy/+package+/templates/layout.jinja2_tmpl
diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.jinja2_tmpl b/src/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.jinja2_tmpl
index 01fe5b8e3..01fe5b8e3 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.jinja2_tmpl
+++ b/src/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.jinja2_tmpl
diff --git a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl b/src/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
index 072eab5b2..072eab5b2 100644
--- a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
+++ b/src/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
diff --git a/pyramid/scaffolds/alchemy/+package+/views/__init__.py b/src/pyramid/scaffolds/alchemy/+package+/views/__init__.py
index e69de29bb..e69de29bb 100644
--- a/pyramid/scaffolds/alchemy/+package+/views/__init__.py
+++ b/src/pyramid/scaffolds/alchemy/+package+/views/__init__.py
diff --git a/pyramid/scaffolds/alchemy/+package+/views/default.py_tmpl b/src/pyramid/scaffolds/alchemy/+package+/views/default.py_tmpl
index 7bf0026e5..7bf0026e5 100644
--- a/pyramid/scaffolds/alchemy/+package+/views/default.py_tmpl
+++ b/src/pyramid/scaffolds/alchemy/+package+/views/default.py_tmpl
diff --git a/pyramid/scaffolds/alchemy/+package+/views/notfound.py_tmpl b/src/pyramid/scaffolds/alchemy/+package+/views/notfound.py_tmpl
index 69d6e2804..69d6e2804 100644
--- a/pyramid/scaffolds/alchemy/+package+/views/notfound.py_tmpl
+++ b/src/pyramid/scaffolds/alchemy/+package+/views/notfound.py_tmpl
diff --git a/pyramid/scaffolds/alchemy/CHANGES.txt_tmpl b/src/pyramid/scaffolds/alchemy/CHANGES.txt_tmpl
index 35a34f332..35a34f332 100644
--- a/pyramid/scaffolds/alchemy/CHANGES.txt_tmpl
+++ b/src/pyramid/scaffolds/alchemy/CHANGES.txt_tmpl
diff --git a/pyramid/scaffolds/alchemy/MANIFEST.in_tmpl b/src/pyramid/scaffolds/alchemy/MANIFEST.in_tmpl
index f93f45544..f93f45544 100644
--- a/pyramid/scaffolds/alchemy/MANIFEST.in_tmpl
+++ b/src/pyramid/scaffolds/alchemy/MANIFEST.in_tmpl
diff --git a/pyramid/scaffolds/alchemy/README.txt_tmpl b/src/pyramid/scaffolds/alchemy/README.txt_tmpl
index 83c37edea..83c37edea 100644
--- a/pyramid/scaffolds/alchemy/README.txt_tmpl
+++ b/src/pyramid/scaffolds/alchemy/README.txt_tmpl
diff --git a/pyramid/scaffolds/alchemy/development.ini_tmpl b/src/pyramid/scaffolds/alchemy/development.ini_tmpl
index 3cfb3996d..3cfb3996d 100644
--- a/pyramid/scaffolds/alchemy/development.ini_tmpl
+++ b/src/pyramid/scaffolds/alchemy/development.ini_tmpl
diff --git a/pyramid/scaffolds/alchemy/production.ini_tmpl b/src/pyramid/scaffolds/alchemy/production.ini_tmpl
index 043229a71..043229a71 100644
--- a/pyramid/scaffolds/alchemy/production.ini_tmpl
+++ b/src/pyramid/scaffolds/alchemy/production.ini_tmpl
diff --git a/pyramid/scaffolds/alchemy/pytest.ini_tmpl b/src/pyramid/scaffolds/alchemy/pytest.ini_tmpl
index a30c8bcad..a30c8bcad 100644
--- a/pyramid/scaffolds/alchemy/pytest.ini_tmpl
+++ b/src/pyramid/scaffolds/alchemy/pytest.ini_tmpl
diff --git a/pyramid/scaffolds/alchemy/setup.py_tmpl b/src/pyramid/scaffolds/alchemy/setup.py_tmpl
index 9318817dc..9318817dc 100644
--- a/pyramid/scaffolds/alchemy/setup.py_tmpl
+++ b/src/pyramid/scaffolds/alchemy/setup.py_tmpl
diff --git a/pyramid/scaffolds/copydir.py b/src/pyramid/scaffolds/copydir.py
index 0914bb0d4..0914bb0d4 100644
--- a/pyramid/scaffolds/copydir.py
+++ b/src/pyramid/scaffolds/copydir.py
diff --git a/pyramid/scaffolds/starter/+dot+coveragerc_tmpl b/src/pyramid/scaffolds/starter/+dot+coveragerc_tmpl
index 273a4a580..273a4a580 100644
--- a/pyramid/scaffolds/starter/+dot+coveragerc_tmpl
+++ b/src/pyramid/scaffolds/starter/+dot+coveragerc_tmpl
diff --git a/pyramid/scaffolds/starter/+package+/__init__.py b/src/pyramid/scaffolds/starter/+package+/__init__.py
index 49dde36d4..49dde36d4 100644
--- a/pyramid/scaffolds/starter/+package+/__init__.py
+++ b/src/pyramid/scaffolds/starter/+package+/__init__.py
diff --git a/pyramid/scaffolds/starter/+package+/static/pyramid-16x16.png b/src/pyramid/scaffolds/starter/+package+/static/pyramid-16x16.png
index 979203112..979203112 100644
--- a/pyramid/scaffolds/starter/+package+/static/pyramid-16x16.png
+++ b/src/pyramid/scaffolds/starter/+package+/static/pyramid-16x16.png
diff --git a/pyramid/scaffolds/starter/+package+/static/pyramid.png b/src/pyramid/scaffolds/starter/+package+/static/pyramid.png
index 4ab837be9..4ab837be9 100644
--- a/pyramid/scaffolds/starter/+package+/static/pyramid.png
+++ b/src/pyramid/scaffolds/starter/+package+/static/pyramid.png
diff --git a/pyramid/scaffolds/starter/+package+/static/theme.css b/src/pyramid/scaffolds/starter/+package+/static/theme.css
index be50ad420..be50ad420 100644
--- a/pyramid/scaffolds/starter/+package+/static/theme.css
+++ b/src/pyramid/scaffolds/starter/+package+/static/theme.css
diff --git a/pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl b/src/pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl
index 54baf7a2a..54baf7a2a 100644
--- a/pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl
+++ b/src/pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl
diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.jinja2_tmpl b/src/pyramid/scaffolds/starter/+package+/templates/mytemplate.jinja2_tmpl
index f826ff9e7..f826ff9e7 100644
--- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.jinja2_tmpl
+++ b/src/pyramid/scaffolds/starter/+package+/templates/mytemplate.jinja2_tmpl
diff --git a/pyramid/scaffolds/starter/+package+/tests.py_tmpl b/src/pyramid/scaffolds/starter/+package+/tests.py_tmpl
index 30f3f0430..30f3f0430 100644
--- a/pyramid/scaffolds/starter/+package+/tests.py_tmpl
+++ b/src/pyramid/scaffolds/starter/+package+/tests.py_tmpl
diff --git a/pyramid/scaffolds/starter/+package+/views.py_tmpl b/src/pyramid/scaffolds/starter/+package+/views.py_tmpl
index 01b9d0130..01b9d0130 100644
--- a/pyramid/scaffolds/starter/+package+/views.py_tmpl
+++ b/src/pyramid/scaffolds/starter/+package+/views.py_tmpl
diff --git a/pyramid/scaffolds/starter/CHANGES.txt_tmpl b/src/pyramid/scaffolds/starter/CHANGES.txt_tmpl
index 35a34f332..35a34f332 100644
--- a/pyramid/scaffolds/starter/CHANGES.txt_tmpl
+++ b/src/pyramid/scaffolds/starter/CHANGES.txt_tmpl
diff --git a/pyramid/scaffolds/starter/MANIFEST.in_tmpl b/src/pyramid/scaffolds/starter/MANIFEST.in_tmpl
index 4d1c86b44..4d1c86b44 100644
--- a/pyramid/scaffolds/starter/MANIFEST.in_tmpl
+++ b/src/pyramid/scaffolds/starter/MANIFEST.in_tmpl
diff --git a/pyramid/scaffolds/starter/README.txt_tmpl b/src/pyramid/scaffolds/starter/README.txt_tmpl
index 127ad7595..127ad7595 100644
--- a/pyramid/scaffolds/starter/README.txt_tmpl
+++ b/src/pyramid/scaffolds/starter/README.txt_tmpl
diff --git a/pyramid/scaffolds/starter/development.ini_tmpl b/src/pyramid/scaffolds/starter/development.ini_tmpl
index c6e42d97c..c6e42d97c 100644
--- a/pyramid/scaffolds/starter/development.ini_tmpl
+++ b/src/pyramid/scaffolds/starter/development.ini_tmpl
diff --git a/pyramid/scaffolds/starter/production.ini_tmpl b/src/pyramid/scaffolds/starter/production.ini_tmpl
index 1107a6b2f..1107a6b2f 100644
--- a/pyramid/scaffolds/starter/production.ini_tmpl
+++ b/src/pyramid/scaffolds/starter/production.ini_tmpl
diff --git a/pyramid/scaffolds/starter/pytest.ini_tmpl b/src/pyramid/scaffolds/starter/pytest.ini_tmpl
index a30c8bcad..a30c8bcad 100644
--- a/pyramid/scaffolds/starter/pytest.ini_tmpl
+++ b/src/pyramid/scaffolds/starter/pytest.ini_tmpl
diff --git a/pyramid/scaffolds/starter/setup.py_tmpl b/src/pyramid/scaffolds/starter/setup.py_tmpl
index 7f50bbbc2..7f50bbbc2 100644
--- a/pyramid/scaffolds/starter/setup.py_tmpl
+++ b/src/pyramid/scaffolds/starter/setup.py_tmpl
diff --git a/pyramid/scaffolds/template.py b/src/pyramid/scaffolds/template.py
index e5098e815..e5098e815 100644
--- a/pyramid/scaffolds/template.py
+++ b/src/pyramid/scaffolds/template.py
diff --git a/pyramid/scaffolds/tests.py b/src/pyramid/scaffolds/tests.py
index 44680a464..44680a464 100644
--- a/pyramid/scaffolds/tests.py
+++ b/src/pyramid/scaffolds/tests.py
diff --git a/pyramid/scaffolds/zodb/+dot+coveragerc_tmpl b/src/pyramid/scaffolds/zodb/+dot+coveragerc_tmpl
index 273a4a580..273a4a580 100644
--- a/pyramid/scaffolds/zodb/+dot+coveragerc_tmpl
+++ b/src/pyramid/scaffolds/zodb/+dot+coveragerc_tmpl
diff --git a/pyramid/scaffolds/zodb/+package+/__init__.py b/src/pyramid/scaffolds/zodb/+package+/__init__.py
index a956d0faf..a956d0faf 100644
--- a/pyramid/scaffolds/zodb/+package+/__init__.py
+++ b/src/pyramid/scaffolds/zodb/+package+/__init__.py
diff --git a/pyramid/scaffolds/zodb/+package+/models.py b/src/pyramid/scaffolds/zodb/+package+/models.py
index e5aa3e9f7..e5aa3e9f7 100644
--- a/pyramid/scaffolds/zodb/+package+/models.py
+++ b/src/pyramid/scaffolds/zodb/+package+/models.py
diff --git a/pyramid/scaffolds/zodb/+package+/static/pyramid-16x16.png b/src/pyramid/scaffolds/zodb/+package+/static/pyramid-16x16.png
index 979203112..979203112 100644
--- a/pyramid/scaffolds/zodb/+package+/static/pyramid-16x16.png
+++ b/src/pyramid/scaffolds/zodb/+package+/static/pyramid-16x16.png
diff --git a/pyramid/scaffolds/zodb/+package+/static/pyramid.png b/src/pyramid/scaffolds/zodb/+package+/static/pyramid.png
index 4ab837be9..4ab837be9 100644
--- a/pyramid/scaffolds/zodb/+package+/static/pyramid.png
+++ b/src/pyramid/scaffolds/zodb/+package+/static/pyramid.png
diff --git a/pyramid/scaffolds/zodb/+package+/static/theme.css b/src/pyramid/scaffolds/zodb/+package+/static/theme.css
index 0f4b1a4d4..0f4b1a4d4 100644
--- a/pyramid/scaffolds/zodb/+package+/static/theme.css
+++ b/src/pyramid/scaffolds/zodb/+package+/static/theme.css
diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/src/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
index f66effa41..f66effa41 100644
--- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/src/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
diff --git a/pyramid/scaffolds/zodb/+package+/tests.py_tmpl b/src/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
index 94912a850..94912a850 100644
--- a/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
+++ b/src/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
diff --git a/pyramid/scaffolds/zodb/+package+/views.py_tmpl b/src/pyramid/scaffolds/zodb/+package+/views.py_tmpl
index 1e8a9b65a..1e8a9b65a 100644
--- a/pyramid/scaffolds/zodb/+package+/views.py_tmpl
+++ b/src/pyramid/scaffolds/zodb/+package+/views.py_tmpl
diff --git a/pyramid/scaffolds/zodb/CHANGES.txt_tmpl b/src/pyramid/scaffolds/zodb/CHANGES.txt_tmpl
index 35a34f332..35a34f332 100644
--- a/pyramid/scaffolds/zodb/CHANGES.txt_tmpl
+++ b/src/pyramid/scaffolds/zodb/CHANGES.txt_tmpl
diff --git a/pyramid/scaffolds/zodb/MANIFEST.in_tmpl b/src/pyramid/scaffolds/zodb/MANIFEST.in_tmpl
index 0ff6eb7a0..0ff6eb7a0 100644
--- a/pyramid/scaffolds/zodb/MANIFEST.in_tmpl
+++ b/src/pyramid/scaffolds/zodb/MANIFEST.in_tmpl
diff --git a/pyramid/scaffolds/zodb/README.txt_tmpl b/src/pyramid/scaffolds/zodb/README.txt_tmpl
index 127ad7595..127ad7595 100644
--- a/pyramid/scaffolds/zodb/README.txt_tmpl
+++ b/src/pyramid/scaffolds/zodb/README.txt_tmpl
diff --git a/pyramid/scaffolds/zodb/development.ini_tmpl b/src/pyramid/scaffolds/zodb/development.ini_tmpl
index 7d898bcd4..7d898bcd4 100644
--- a/pyramid/scaffolds/zodb/development.ini_tmpl
+++ b/src/pyramid/scaffolds/zodb/development.ini_tmpl
diff --git a/pyramid/scaffolds/zodb/production.ini_tmpl b/src/pyramid/scaffolds/zodb/production.ini_tmpl
index 7c2e90c2e..7c2e90c2e 100644
--- a/pyramid/scaffolds/zodb/production.ini_tmpl
+++ b/src/pyramid/scaffolds/zodb/production.ini_tmpl
diff --git a/pyramid/scaffolds/zodb/pytest.ini_tmpl b/src/pyramid/scaffolds/zodb/pytest.ini_tmpl
index a30c8bcad..a30c8bcad 100644
--- a/pyramid/scaffolds/zodb/pytest.ini_tmpl
+++ b/src/pyramid/scaffolds/zodb/pytest.ini_tmpl
diff --git a/pyramid/scaffolds/zodb/setup.py_tmpl b/src/pyramid/scaffolds/zodb/setup.py_tmpl
index 19771d756..19771d756 100644
--- a/pyramid/scaffolds/zodb/setup.py_tmpl
+++ b/src/pyramid/scaffolds/zodb/setup.py_tmpl
diff --git a/pyramid/scripting.py b/src/pyramid/scripting.py
index 087b55ccb..087b55ccb 100644
--- a/pyramid/scripting.py
+++ b/src/pyramid/scripting.py
diff --git a/pyramid/scripts/__init__.py b/src/pyramid/scripts/__init__.py
index 5bb534f79..5bb534f79 100644
--- a/pyramid/scripts/__init__.py
+++ b/src/pyramid/scripts/__init__.py
diff --git a/pyramid/scripts/common.py b/src/pyramid/scripts/common.py
index f4b8027db..f4b8027db 100644
--- a/pyramid/scripts/common.py
+++ b/src/pyramid/scripts/common.py
diff --git a/pyramid/scripts/pcreate.py b/src/pyramid/scripts/pcreate.py
index a6db520ce..a6db520ce 100644
--- a/pyramid/scripts/pcreate.py
+++ b/src/pyramid/scripts/pcreate.py
diff --git a/pyramid/scripts/pdistreport.py b/src/pyramid/scripts/pdistreport.py
index 1952e5d39..1952e5d39 100644
--- a/pyramid/scripts/pdistreport.py
+++ b/src/pyramid/scripts/pdistreport.py
diff --git a/pyramid/scripts/prequest.py b/src/pyramid/scripts/prequest.py
index f0681afd7..f0681afd7 100644
--- a/pyramid/scripts/prequest.py
+++ b/src/pyramid/scripts/prequest.py
diff --git a/pyramid/scripts/proutes.py b/src/pyramid/scripts/proutes.py
index 69d61ae8f..69d61ae8f 100644
--- a/pyramid/scripts/proutes.py
+++ b/src/pyramid/scripts/proutes.py
diff --git a/pyramid/scripts/pserve.py b/src/pyramid/scripts/pserve.py
index 8ee6e1467..8ee6e1467 100644
--- a/pyramid/scripts/pserve.py
+++ b/src/pyramid/scripts/pserve.py
diff --git a/pyramid/scripts/pshell.py b/src/pyramid/scripts/pshell.py
index 4898eb39f..4898eb39f 100644
--- a/pyramid/scripts/pshell.py
+++ b/src/pyramid/scripts/pshell.py
diff --git a/pyramid/scripts/ptweens.py b/src/pyramid/scripts/ptweens.py
index d5cbebe12..d5cbebe12 100644
--- a/pyramid/scripts/ptweens.py
+++ b/src/pyramid/scripts/ptweens.py
diff --git a/pyramid/scripts/pviews.py b/src/pyramid/scripts/pviews.py
index c0df2f078..c0df2f078 100644
--- a/pyramid/scripts/pviews.py
+++ b/src/pyramid/scripts/pviews.py
diff --git a/pyramid/security.py b/src/pyramid/security.py
index 0bdca090b..0bdca090b 100644
--- a/pyramid/security.py
+++ b/src/pyramid/security.py
diff --git a/pyramid/session.py b/src/pyramid/session.py
index b953fa184..b953fa184 100644
--- a/pyramid/session.py
+++ b/src/pyramid/session.py
diff --git a/pyramid/settings.py b/src/pyramid/settings.py
index 8a498d572..8a498d572 100644
--- a/pyramid/settings.py
+++ b/src/pyramid/settings.py
diff --git a/pyramid/static.py b/src/pyramid/static.py
index 70fdf877b..70fdf877b 100644
--- a/pyramid/static.py
+++ b/src/pyramid/static.py
diff --git a/pyramid/testing.py b/src/pyramid/testing.py
index 4986c0e27..4986c0e27 100644
--- a/pyramid/testing.py
+++ b/src/pyramid/testing.py
diff --git a/pyramid/tests/__init__.py b/src/pyramid/tests/__init__.py
index a62c29f47..a62c29f47 100644
--- a/pyramid/tests/__init__.py
+++ b/src/pyramid/tests/__init__.py
diff --git a/pyramid/tests/fixtures/dummy.ini b/src/pyramid/tests/fixtures/dummy.ini
index bc2281168..bc2281168 100644
--- a/pyramid/tests/fixtures/dummy.ini
+++ b/src/pyramid/tests/fixtures/dummy.ini
diff --git a/pyramid/tests/fixtures/manifest.json b/src/pyramid/tests/fixtures/manifest.json
index 0a43bc5e3..0a43bc5e3 100644
--- a/pyramid/tests/fixtures/manifest.json
+++ b/src/pyramid/tests/fixtures/manifest.json
diff --git a/pyramid/tests/fixtures/manifest2.json b/src/pyramid/tests/fixtures/manifest2.json
index fd6b9a7bb..fd6b9a7bb 100644
--- a/pyramid/tests/fixtures/manifest2.json
+++ b/src/pyramid/tests/fixtures/manifest2.json
diff --git a/pyramid/tests/fixtures/minimal.jpg b/src/pyramid/tests/fixtures/minimal.jpg
index 1cda9a53d..1cda9a53d 100644
--- a/pyramid/tests/fixtures/minimal.jpg
+++ b/src/pyramid/tests/fixtures/minimal.jpg
diff --git a/pyramid/tests/fixtures/minimal.pdf b/src/pyramid/tests/fixtures/minimal.pdf
index e267be996..e267be996 100755
--- a/pyramid/tests/fixtures/minimal.pdf
+++ b/src/pyramid/tests/fixtures/minimal.pdf
diff --git a/pyramid/tests/fixtures/minimal.txt b/src/pyramid/tests/fixtures/minimal.txt
index 18832d351..18832d351 100644
--- a/pyramid/tests/fixtures/minimal.txt
+++ b/src/pyramid/tests/fixtures/minimal.txt
diff --git a/pyramid/tests/fixtures/minimal.xml b/src/pyramid/tests/fixtures/minimal.xml
index 1972c155d..1972c155d 100644
--- a/pyramid/tests/fixtures/minimal.xml
+++ b/src/pyramid/tests/fixtures/minimal.xml
diff --git a/pyramid/tests/fixtures/nonminimal.txt b/src/pyramid/tests/fixtures/nonminimal.txt
index 9de95ec92..9de95ec92 100644
--- a/pyramid/tests/fixtures/nonminimal.txt
+++ b/src/pyramid/tests/fixtures/nonminimal.txt
diff --git a/pyramid/tests/fixtures/static/.hiddenfile b/src/pyramid/tests/fixtures/static/.hiddenfile
index 86d345000..86d345000 100644
--- a/pyramid/tests/fixtures/static/.hiddenfile
+++ b/src/pyramid/tests/fixtures/static/.hiddenfile
diff --git a/pyramid/tests/fixtures/static/arcs.svg.tgz b/src/pyramid/tests/fixtures/static/arcs.svg.tgz
index 376c42ac8..376c42ac8 100644
--- a/pyramid/tests/fixtures/static/arcs.svg.tgz
+++ b/src/pyramid/tests/fixtures/static/arcs.svg.tgz
diff --git a/pyramid/tests/fixtures/static/index.html b/src/pyramid/tests/fixtures/static/index.html
index 0470710b2..0470710b2 100644
--- a/pyramid/tests/fixtures/static/index.html
+++ b/src/pyramid/tests/fixtures/static/index.html
diff --git a/pyramid/tests/fixtures/static/subdir/index.html b/src/pyramid/tests/fixtures/static/subdir/index.html
index bb84fad04..bb84fad04 100644
--- a/pyramid/tests/fixtures/static/subdir/index.html
+++ b/src/pyramid/tests/fixtures/static/subdir/index.html
diff --git a/pyramid/tests/pkgs/__init__.py b/src/pyramid/tests/pkgs/__init__.py
index 5bb534f79..5bb534f79 100644
--- a/pyramid/tests/pkgs/__init__.py
+++ b/src/pyramid/tests/pkgs/__init__.py
diff --git a/pyramid/tests/pkgs/ccbugapp/__init__.py b/src/pyramid/tests/pkgs/ccbugapp/__init__.py
index afe21d4e0..afe21d4e0 100644
--- a/pyramid/tests/pkgs/ccbugapp/__init__.py
+++ b/src/pyramid/tests/pkgs/ccbugapp/__init__.py
diff --git a/pyramid/tests/pkgs/conflictapp/__init__.py b/src/pyramid/tests/pkgs/conflictapp/__init__.py
index 38116ab2f..38116ab2f 100644
--- a/pyramid/tests/pkgs/conflictapp/__init__.py
+++ b/src/pyramid/tests/pkgs/conflictapp/__init__.py
diff --git a/pyramid/tests/pkgs/conflictapp/included.py b/src/pyramid/tests/pkgs/conflictapp/included.py
index 0b76fb2bc..0b76fb2bc 100644
--- a/pyramid/tests/pkgs/conflictapp/included.py
+++ b/src/pyramid/tests/pkgs/conflictapp/included.py
diff --git a/pyramid/tests/pkgs/defpermbugapp/__init__.py b/src/pyramid/tests/pkgs/defpermbugapp/__init__.py
index 032e8c626..032e8c626 100644
--- a/pyramid/tests/pkgs/defpermbugapp/__init__.py
+++ b/src/pyramid/tests/pkgs/defpermbugapp/__init__.py
diff --git a/pyramid/tests/pkgs/eventonly/__init__.py b/src/pyramid/tests/pkgs/eventonly/__init__.py
index 7ae93ada6..7ae93ada6 100644
--- a/pyramid/tests/pkgs/eventonly/__init__.py
+++ b/src/pyramid/tests/pkgs/eventonly/__init__.py
diff --git a/pyramid/tests/pkgs/exceptionviewapp/__init__.py b/src/pyramid/tests/pkgs/exceptionviewapp/__init__.py
index ffc1b47c6..ffc1b47c6 100644
--- a/pyramid/tests/pkgs/exceptionviewapp/__init__.py
+++ b/src/pyramid/tests/pkgs/exceptionviewapp/__init__.py
diff --git a/pyramid/tests/pkgs/exceptionviewapp/models.py b/src/pyramid/tests/pkgs/exceptionviewapp/models.py
index fe407badc..fe407badc 100644
--- a/pyramid/tests/pkgs/exceptionviewapp/models.py
+++ b/src/pyramid/tests/pkgs/exceptionviewapp/models.py
diff --git a/pyramid/tests/pkgs/exceptionviewapp/views.py b/src/pyramid/tests/pkgs/exceptionviewapp/views.py
index 4953056bc..4953056bc 100644
--- a/pyramid/tests/pkgs/exceptionviewapp/views.py
+++ b/src/pyramid/tests/pkgs/exceptionviewapp/views.py
diff --git a/pyramid/tests/pkgs/fixtureapp/__init__.py b/src/pyramid/tests/pkgs/fixtureapp/__init__.py
index 27063aae2..27063aae2 100644
--- a/pyramid/tests/pkgs/fixtureapp/__init__.py
+++ b/src/pyramid/tests/pkgs/fixtureapp/__init__.py
diff --git a/pyramid/tests/pkgs/fixtureapp/models.py b/src/pyramid/tests/pkgs/fixtureapp/models.py
index d80d14bb3..d80d14bb3 100644
--- a/pyramid/tests/pkgs/fixtureapp/models.py
+++ b/src/pyramid/tests/pkgs/fixtureapp/models.py
diff --git a/pyramid/tests/pkgs/fixtureapp/subpackage/__init__.py b/src/pyramid/tests/pkgs/fixtureapp/subpackage/__init__.py
index d3173e636..d3173e636 100644
--- a/pyramid/tests/pkgs/fixtureapp/subpackage/__init__.py
+++ b/src/pyramid/tests/pkgs/fixtureapp/subpackage/__init__.py
diff --git a/pyramid/tests/pkgs/fixtureapp/views.py b/src/pyramid/tests/pkgs/fixtureapp/views.py
index cbfc5a574..cbfc5a574 100644
--- a/pyramid/tests/pkgs/fixtureapp/views.py
+++ b/src/pyramid/tests/pkgs/fixtureapp/views.py
diff --git a/pyramid/tests/pkgs/forbiddenapp/__init__.py b/src/pyramid/tests/pkgs/forbiddenapp/__init__.py
index c378126fc..c378126fc 100644
--- a/pyramid/tests/pkgs/forbiddenapp/__init__.py
+++ b/src/pyramid/tests/pkgs/forbiddenapp/__init__.py
diff --git a/pyramid/tests/pkgs/forbiddenview/__init__.py b/src/pyramid/tests/pkgs/forbiddenview/__init__.py
index 45fb8380b..45fb8380b 100644
--- a/pyramid/tests/pkgs/forbiddenview/__init__.py
+++ b/src/pyramid/tests/pkgs/forbiddenview/__init__.py
diff --git a/pyramid/tests/pkgs/hybridapp/__init__.py b/src/pyramid/tests/pkgs/hybridapp/__init__.py
index 1cc2dde83..1cc2dde83 100644
--- a/pyramid/tests/pkgs/hybridapp/__init__.py
+++ b/src/pyramid/tests/pkgs/hybridapp/__init__.py
diff --git a/pyramid/tests/pkgs/hybridapp/views.py b/src/pyramid/tests/pkgs/hybridapp/views.py
index 135ef8290..135ef8290 100644
--- a/pyramid/tests/pkgs/hybridapp/views.py
+++ b/src/pyramid/tests/pkgs/hybridapp/views.py
diff --git a/pyramid/tests/pkgs/includeapp1/__init__.py b/src/pyramid/tests/pkgs/includeapp1/__init__.py
index eaeeb7ef6..eaeeb7ef6 100644
--- a/pyramid/tests/pkgs/includeapp1/__init__.py
+++ b/src/pyramid/tests/pkgs/includeapp1/__init__.py
diff --git a/pyramid/tests/pkgs/includeapp1/root.py b/src/pyramid/tests/pkgs/includeapp1/root.py
index f56203cfa..f56203cfa 100644
--- a/pyramid/tests/pkgs/includeapp1/root.py
+++ b/src/pyramid/tests/pkgs/includeapp1/root.py
diff --git a/pyramid/tests/pkgs/includeapp1/three.py b/src/pyramid/tests/pkgs/includeapp1/three.py
index e7131bcf5..e7131bcf5 100644
--- a/pyramid/tests/pkgs/includeapp1/three.py
+++ b/src/pyramid/tests/pkgs/includeapp1/three.py
diff --git a/pyramid/tests/pkgs/includeapp1/two.py b/src/pyramid/tests/pkgs/includeapp1/two.py
index 99b0f883a..99b0f883a 100644
--- a/pyramid/tests/pkgs/includeapp1/two.py
+++ b/src/pyramid/tests/pkgs/includeapp1/two.py
diff --git a/pyramid/tests/pkgs/localeapp/__init__.py b/src/pyramid/tests/pkgs/localeapp/__init__.py
index 1a35cdb4a..1a35cdb4a 100644
--- a/pyramid/tests/pkgs/localeapp/__init__.py
+++ b/src/pyramid/tests/pkgs/localeapp/__init__.py
diff --git a/pyramid/tests/pkgs/localeapp/locale/GARBAGE b/src/pyramid/tests/pkgs/localeapp/locale/GARBAGE
index 032c55584..032c55584 100644
--- a/pyramid/tests/pkgs/localeapp/locale/GARBAGE
+++ b/src/pyramid/tests/pkgs/localeapp/locale/GARBAGE
diff --git a/pyramid/tests/pkgs/localeapp/locale/be/LC_MESSAGES b/src/pyramid/tests/pkgs/localeapp/locale/be/LC_MESSAGES
index 909cf6a3b..909cf6a3b 100644
--- a/pyramid/tests/pkgs/localeapp/locale/be/LC_MESSAGES
+++ b/src/pyramid/tests/pkgs/localeapp/locale/be/LC_MESSAGES
diff --git a/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.mo b/src/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.mo
index 2924a5eb5..2924a5eb5 100644
--- a/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.mo
+++ b/src/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.mo
diff --git a/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.po b/src/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.po
index 17f87bc19..17f87bc19 100644
--- a/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.po
+++ b/src/pyramid/tests/pkgs/localeapp/locale/de/LC_MESSAGES/deformsite.po
diff --git a/pyramid/tests/pkgs/localeapp/locale/de_DE/LC_MESSAGES/deformsite.mo b/src/pyramid/tests/pkgs/localeapp/locale/de_DE/LC_MESSAGES/deformsite.mo
index e3b2b0881..e3b2b0881 100644
--- a/pyramid/tests/pkgs/localeapp/locale/de_DE/LC_MESSAGES/deformsite.mo
+++ b/src/pyramid/tests/pkgs/localeapp/locale/de_DE/LC_MESSAGES/deformsite.mo
diff --git a/pyramid/tests/pkgs/localeapp/locale/de_DE/LC_MESSAGES/deformsite.po b/src/pyramid/tests/pkgs/localeapp/locale/de_DE/LC_MESSAGES/deformsite.po
index be055bed9..be055bed9 100644
--- a/pyramid/tests/pkgs/localeapp/locale/de_DE/LC_MESSAGES/deformsite.po
+++ b/src/pyramid/tests/pkgs/localeapp/locale/de_DE/LC_MESSAGES/deformsite.po
diff --git a/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.mo b/src/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.mo
index 2924a5eb5..2924a5eb5 100644
--- a/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.mo
+++ b/src/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.mo
diff --git a/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.po b/src/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.po
index 17f87bc19..17f87bc19 100644
--- a/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.po
+++ b/src/pyramid/tests/pkgs/localeapp/locale/en/LC_MESSAGES/deformsite.po
diff --git a/pyramid/tests/pkgs/localeapp/locale2/GARBAGE b/src/pyramid/tests/pkgs/localeapp/locale2/GARBAGE
index 032c55584..032c55584 100644
--- a/pyramid/tests/pkgs/localeapp/locale2/GARBAGE
+++ b/src/pyramid/tests/pkgs/localeapp/locale2/GARBAGE
diff --git a/pyramid/tests/pkgs/localeapp/locale2/be/LC_MESSAGES b/src/pyramid/tests/pkgs/localeapp/locale2/be/LC_MESSAGES
index 909cf6a3b..909cf6a3b 100644
--- a/pyramid/tests/pkgs/localeapp/locale2/be/LC_MESSAGES
+++ b/src/pyramid/tests/pkgs/localeapp/locale2/be/LC_MESSAGES
diff --git a/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.mo b/src/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.mo
index 2924a5eb5..2924a5eb5 100644
--- a/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.mo
+++ b/src/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.mo
diff --git a/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.po b/src/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.po
index 17f87bc19..17f87bc19 100644
--- a/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.po
+++ b/src/pyramid/tests/pkgs/localeapp/locale2/de/LC_MESSAGES/deformsite.po
diff --git a/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.mo b/src/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.mo
index 2924a5eb5..2924a5eb5 100644
--- a/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.mo
+++ b/src/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.mo
diff --git a/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.po b/src/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.po
index 17f87bc19..17f87bc19 100644
--- a/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.po
+++ b/src/pyramid/tests/pkgs/localeapp/locale2/en/LC_MESSAGES/deformsite.po
diff --git a/pyramid/tests/pkgs/localeapp/locale3/GARBAGE b/src/pyramid/tests/pkgs/localeapp/locale3/GARBAGE
index 032c55584..032c55584 100644
--- a/pyramid/tests/pkgs/localeapp/locale3/GARBAGE
+++ b/src/pyramid/tests/pkgs/localeapp/locale3/GARBAGE
diff --git a/pyramid/tests/pkgs/localeapp/locale3/be/LC_MESSAGES b/src/pyramid/tests/pkgs/localeapp/locale3/be/LC_MESSAGES
index 909cf6a3b..909cf6a3b 100644
--- a/pyramid/tests/pkgs/localeapp/locale3/be/LC_MESSAGES
+++ b/src/pyramid/tests/pkgs/localeapp/locale3/be/LC_MESSAGES
diff --git a/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.mo b/src/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.mo
index 2924a5eb5..2924a5eb5 100644
--- a/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.mo
+++ b/src/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.mo
diff --git a/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.po b/src/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.po
index 17f87bc19..17f87bc19 100644
--- a/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.po
+++ b/src/pyramid/tests/pkgs/localeapp/locale3/de/LC_MESSAGES/deformsite.po
diff --git a/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.mo b/src/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.mo
index 2924a5eb5..2924a5eb5 100644
--- a/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.mo
+++ b/src/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.mo
diff --git a/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.po b/src/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.po
index 17f87bc19..17f87bc19 100644
--- a/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.po
+++ b/src/pyramid/tests/pkgs/localeapp/locale3/en/LC_MESSAGES/deformsite.po
diff --git a/pyramid/tests/pkgs/notfoundview/__init__.py b/src/pyramid/tests/pkgs/notfoundview/__init__.py
index ae148ea8c..ae148ea8c 100644
--- a/pyramid/tests/pkgs/notfoundview/__init__.py
+++ b/src/pyramid/tests/pkgs/notfoundview/__init__.py
diff --git a/pyramid/tests/pkgs/permbugapp/__init__.py b/src/pyramid/tests/pkgs/permbugapp/__init__.py
index 4868427a5..4868427a5 100644
--- a/pyramid/tests/pkgs/permbugapp/__init__.py
+++ b/src/pyramid/tests/pkgs/permbugapp/__init__.py
diff --git a/pyramid/tests/pkgs/rendererscanapp/__init__.py b/src/pyramid/tests/pkgs/rendererscanapp/__init__.py
index f3276a063..f3276a063 100644
--- a/pyramid/tests/pkgs/rendererscanapp/__init__.py
+++ b/src/pyramid/tests/pkgs/rendererscanapp/__init__.py
diff --git a/pyramid/tests/pkgs/rendererscanapp/two/__init__.py b/src/pyramid/tests/pkgs/rendererscanapp/two/__init__.py
index 6f575dd83..6f575dd83 100644
--- a/pyramid/tests/pkgs/rendererscanapp/two/__init__.py
+++ b/src/pyramid/tests/pkgs/rendererscanapp/two/__init__.py
diff --git a/pyramid/tests/pkgs/restbugapp/__init__.py b/src/pyramid/tests/pkgs/restbugapp/__init__.py
index 9ad79e32e..9ad79e32e 100644
--- a/pyramid/tests/pkgs/restbugapp/__init__.py
+++ b/src/pyramid/tests/pkgs/restbugapp/__init__.py
diff --git a/pyramid/tests/pkgs/restbugapp/views.py b/src/pyramid/tests/pkgs/restbugapp/views.py
index 2ace59fa9..2ace59fa9 100644
--- a/pyramid/tests/pkgs/restbugapp/views.py
+++ b/src/pyramid/tests/pkgs/restbugapp/views.py
diff --git a/pyramid/tests/pkgs/static_abspath/__init__.py b/src/pyramid/tests/pkgs/static_abspath/__init__.py
index 812cca467..812cca467 100644
--- a/pyramid/tests/pkgs/static_abspath/__init__.py
+++ b/src/pyramid/tests/pkgs/static_abspath/__init__.py
diff --git a/pyramid/tests/pkgs/static_assetspec/__init__.py b/src/pyramid/tests/pkgs/static_assetspec/__init__.py
index cd6195397..cd6195397 100644
--- a/pyramid/tests/pkgs/static_assetspec/__init__.py
+++ b/src/pyramid/tests/pkgs/static_assetspec/__init__.py
diff --git a/pyramid/tests/pkgs/static_routeprefix/__init__.py b/src/pyramid/tests/pkgs/static_routeprefix/__init__.py
index 9b539380a..9b539380a 100644
--- a/pyramid/tests/pkgs/static_routeprefix/__init__.py
+++ b/src/pyramid/tests/pkgs/static_routeprefix/__init__.py
diff --git a/pyramid/tests/pkgs/staticpermapp/__init__.py b/src/pyramid/tests/pkgs/staticpermapp/__init__.py
index cc690d937..cc690d937 100644
--- a/pyramid/tests/pkgs/staticpermapp/__init__.py
+++ b/src/pyramid/tests/pkgs/staticpermapp/__init__.py
diff --git a/pyramid/tests/pkgs/subrequestapp/__init__.py b/src/pyramid/tests/pkgs/subrequestapp/__init__.py
index e4b1d386a..e4b1d386a 100644
--- a/pyramid/tests/pkgs/subrequestapp/__init__.py
+++ b/src/pyramid/tests/pkgs/subrequestapp/__init__.py
diff --git a/pyramid/tests/pkgs/viewdecoratorapp/__init__.py b/src/pyramid/tests/pkgs/viewdecoratorapp/__init__.py
index 5fa98062a..5fa98062a 100644
--- a/pyramid/tests/pkgs/viewdecoratorapp/__init__.py
+++ b/src/pyramid/tests/pkgs/viewdecoratorapp/__init__.py
diff --git a/pyramid/tests/pkgs/viewdecoratorapp/views/__init__.py b/src/pyramid/tests/pkgs/viewdecoratorapp/views/__init__.py
index 5bb534f79..5bb534f79 100644
--- a/pyramid/tests/pkgs/viewdecoratorapp/views/__init__.py
+++ b/src/pyramid/tests/pkgs/viewdecoratorapp/views/__init__.py
diff --git a/pyramid/tests/pkgs/viewdecoratorapp/views/views.py b/src/pyramid/tests/pkgs/viewdecoratorapp/views/views.py
index 18ec78847..18ec78847 100644
--- a/pyramid/tests/pkgs/viewdecoratorapp/views/views.py
+++ b/src/pyramid/tests/pkgs/viewdecoratorapp/views/views.py
diff --git a/pyramid/tests/pkgs/wsgiapp2app/__init__.py b/src/pyramid/tests/pkgs/wsgiapp2app/__init__.py
index e2024198e..e2024198e 100644
--- a/pyramid/tests/pkgs/wsgiapp2app/__init__.py
+++ b/src/pyramid/tests/pkgs/wsgiapp2app/__init__.py
diff --git a/pyramid/tests/test_asset.py b/src/pyramid/tests/test_asset.py
index d3ebd5f7d..d3ebd5f7d 100644
--- a/pyramid/tests/test_asset.py
+++ b/src/pyramid/tests/test_asset.py
diff --git a/pyramid/tests/test_authentication.py b/src/pyramid/tests/test_authentication.py
index 4efd76f2b..4efd76f2b 100644
--- a/pyramid/tests/test_authentication.py
+++ b/src/pyramid/tests/test_authentication.py
diff --git a/pyramid/tests/test_authorization.py b/src/pyramid/tests/test_authorization.py
index 05cd3b4f8..05cd3b4f8 100644
--- a/pyramid/tests/test_authorization.py
+++ b/src/pyramid/tests/test_authorization.py
diff --git a/pyramid/tests/test_compat.py b/src/pyramid/tests/test_compat.py
index 23ccce82e..23ccce82e 100644
--- a/pyramid/tests/test_compat.py
+++ b/src/pyramid/tests/test_compat.py
diff --git a/pyramid/tests/test_config/__init__.py b/src/pyramid/tests/test_config/__init__.py
index 81d9f4965..81d9f4965 100644
--- a/pyramid/tests/test_config/__init__.py
+++ b/src/pyramid/tests/test_config/__init__.py
diff --git a/pyramid/tests/test_config/files/assets/dummy.txt b/src/pyramid/tests/test_config/files/assets/dummy.txt
index 18832d351..18832d351 100644
--- a/pyramid/tests/test_config/files/assets/dummy.txt
+++ b/src/pyramid/tests/test_config/files/assets/dummy.txt
diff --git a/pyramid/tests/test_config/files/minimal.txt b/src/pyramid/tests/test_config/files/minimal.txt
index 19fe66dfa..19fe66dfa 100644
--- a/pyramid/tests/test_config/files/minimal.txt
+++ b/src/pyramid/tests/test_config/files/minimal.txt
diff --git a/pyramid/tests/test_config/path/scanerror/__init__.py b/src/pyramid/tests/test_config/path/scanerror/__init__.py
index 86770ad89..86770ad89 100644
--- a/pyramid/tests/test_config/path/scanerror/__init__.py
+++ b/src/pyramid/tests/test_config/path/scanerror/__init__.py
diff --git a/pyramid/tests/test_config/path/scanerror/will_raise_error.py b/src/pyramid/tests/test_config/path/scanerror/will_raise_error.py
index 9098ff1fe..9098ff1fe 100644
--- a/pyramid/tests/test_config/path/scanerror/will_raise_error.py
+++ b/src/pyramid/tests/test_config/path/scanerror/will_raise_error.py
diff --git a/pyramid/tests/test_config/pkgs/__init__.py b/src/pyramid/tests/test_config/pkgs/__init__.py
index ed88d78b4..ed88d78b4 100644
--- a/pyramid/tests/test_config/pkgs/__init__.py
+++ b/src/pyramid/tests/test_config/pkgs/__init__.py
diff --git a/pyramid/tests/test_config/pkgs/asset/__init__.py b/src/pyramid/tests/test_config/pkgs/asset/__init__.py
index db5619fbc..db5619fbc 100644
--- a/pyramid/tests/test_config/pkgs/asset/__init__.py
+++ b/src/pyramid/tests/test_config/pkgs/asset/__init__.py
diff --git a/pyramid/tests/test_config/pkgs/asset/subpackage/__init__.py b/src/pyramid/tests/test_config/pkgs/asset/subpackage/__init__.py
index d3173e636..d3173e636 100644
--- a/pyramid/tests/test_config/pkgs/asset/subpackage/__init__.py
+++ b/src/pyramid/tests/test_config/pkgs/asset/subpackage/__init__.py
diff --git a/pyramid/tests/test_config/pkgs/asset/subpackage/templates/bar.pt b/src/pyramid/tests/test_config/pkgs/asset/subpackage/templates/bar.pt
index e69de29bb..e69de29bb 100644
--- a/pyramid/tests/test_config/pkgs/asset/subpackage/templates/bar.pt
+++ b/src/pyramid/tests/test_config/pkgs/asset/subpackage/templates/bar.pt
diff --git a/pyramid/tests/test_config/pkgs/scanextrakw/__init__.py b/src/pyramid/tests/test_config/pkgs/scanextrakw/__init__.py
index ce5e07238..ce5e07238 100644
--- a/pyramid/tests/test_config/pkgs/scanextrakw/__init__.py
+++ b/src/pyramid/tests/test_config/pkgs/scanextrakw/__init__.py
diff --git a/pyramid/tests/test_config/pkgs/scannable/__init__.py b/src/pyramid/tests/test_config/pkgs/scannable/__init__.py
index 562413a41..562413a41 100644
--- a/pyramid/tests/test_config/pkgs/scannable/__init__.py
+++ b/src/pyramid/tests/test_config/pkgs/scannable/__init__.py
diff --git a/pyramid/tests/test_config/pkgs/scannable/another.py b/src/pyramid/tests/test_config/pkgs/scannable/another.py
index 529821b5c..529821b5c 100644
--- a/pyramid/tests/test_config/pkgs/scannable/another.py
+++ b/src/pyramid/tests/test_config/pkgs/scannable/another.py
diff --git a/pyramid/tests/test_config/pkgs/scannable/pod/notinit.py b/src/pyramid/tests/test_config/pkgs/scannable/pod/notinit.py
index 91dcd161b..91dcd161b 100644
--- a/pyramid/tests/test_config/pkgs/scannable/pod/notinit.py
+++ b/src/pyramid/tests/test_config/pkgs/scannable/pod/notinit.py
diff --git a/pyramid/tests/test_config/pkgs/scannable/subpackage/__init__.py b/src/pyramid/tests/test_config/pkgs/scannable/subpackage/__init__.py
index 9e0ddacbd..9e0ddacbd 100644
--- a/pyramid/tests/test_config/pkgs/scannable/subpackage/__init__.py
+++ b/src/pyramid/tests/test_config/pkgs/scannable/subpackage/__init__.py
diff --git a/pyramid/tests/test_config/pkgs/scannable/subpackage/notinit.py b/src/pyramid/tests/test_config/pkgs/scannable/subpackage/notinit.py
index f7edd0c68..f7edd0c68 100644
--- a/pyramid/tests/test_config/pkgs/scannable/subpackage/notinit.py
+++ b/src/pyramid/tests/test_config/pkgs/scannable/subpackage/notinit.py
diff --git a/pyramid/tests/test_config/pkgs/scannable/subpackage/subsubpackage/__init__.py b/src/pyramid/tests/test_config/pkgs/scannable/subpackage/subsubpackage/__init__.py
index fdda0dffe..fdda0dffe 100644
--- a/pyramid/tests/test_config/pkgs/scannable/subpackage/subsubpackage/__init__.py
+++ b/src/pyramid/tests/test_config/pkgs/scannable/subpackage/subsubpackage/__init__.py
diff --git a/pyramid/tests/test_config/pkgs/selfscan/__init__.py b/src/pyramid/tests/test_config/pkgs/selfscan/__init__.py
index 779ea3eed..779ea3eed 100644
--- a/pyramid/tests/test_config/pkgs/selfscan/__init__.py
+++ b/src/pyramid/tests/test_config/pkgs/selfscan/__init__.py
diff --git a/pyramid/tests/test_config/pkgs/selfscan/another.py b/src/pyramid/tests/test_config/pkgs/selfscan/another.py
index a30ad3297..a30ad3297 100644
--- a/pyramid/tests/test_config/pkgs/selfscan/another.py
+++ b/src/pyramid/tests/test_config/pkgs/selfscan/another.py
diff --git a/pyramid/tests/test_config/test_adapters.py b/src/pyramid/tests/test_config/test_adapters.py
index ab5d6ef61..ab5d6ef61 100644
--- a/pyramid/tests/test_config/test_adapters.py
+++ b/src/pyramid/tests/test_config/test_adapters.py
diff --git a/pyramid/tests/test_config/test_assets.py b/src/pyramid/tests/test_config/test_assets.py
index 842c73da6..842c73da6 100644
--- a/pyramid/tests/test_config/test_assets.py
+++ b/src/pyramid/tests/test_config/test_assets.py
diff --git a/pyramid/tests/test_config/test_factories.py b/src/pyramid/tests/test_config/test_factories.py
index 7e6ea0476..7e6ea0476 100644
--- a/pyramid/tests/test_config/test_factories.py
+++ b/src/pyramid/tests/test_config/test_factories.py
diff --git a/pyramid/tests/test_config/test_i18n.py b/src/pyramid/tests/test_config/test_i18n.py
index c10ab6bdb..c10ab6bdb 100644
--- a/pyramid/tests/test_config/test_i18n.py
+++ b/src/pyramid/tests/test_config/test_i18n.py
diff --git a/pyramid/tests/test_config/test_init.py b/src/pyramid/tests/test_config/test_init.py
index 76a3d703d..76a3d703d 100644
--- a/pyramid/tests/test_config/test_init.py
+++ b/src/pyramid/tests/test_config/test_init.py
diff --git a/pyramid/tests/test_config/test_rendering.py b/src/pyramid/tests/test_config/test_rendering.py
index cede64d3a..cede64d3a 100644
--- a/pyramid/tests/test_config/test_rendering.py
+++ b/src/pyramid/tests/test_config/test_rendering.py
diff --git a/pyramid/tests/test_config/test_routes.py b/src/pyramid/tests/test_config/test_routes.py
index 9f4ce9bc6..9f4ce9bc6 100644
--- a/pyramid/tests/test_config/test_routes.py
+++ b/src/pyramid/tests/test_config/test_routes.py
diff --git a/pyramid/tests/test_config/test_security.py b/src/pyramid/tests/test_config/test_security.py
index 5db8e21fc..5db8e21fc 100644
--- a/pyramid/tests/test_config/test_security.py
+++ b/src/pyramid/tests/test_config/test_security.py
diff --git a/pyramid/tests/test_config/test_settings.py b/src/pyramid/tests/test_config/test_settings.py
index a3afd24e7..a3afd24e7 100644
--- a/pyramid/tests/test_config/test_settings.py
+++ b/src/pyramid/tests/test_config/test_settings.py
diff --git a/pyramid/tests/test_config/test_testing.py b/src/pyramid/tests/test_config/test_testing.py
index 05561bfe9..05561bfe9 100644
--- a/pyramid/tests/test_config/test_testing.py
+++ b/src/pyramid/tests/test_config/test_testing.py
diff --git a/pyramid/tests/test_config/test_tweens.py b/src/pyramid/tests/test_config/test_tweens.py
index 9c3433468..9c3433468 100644
--- a/pyramid/tests/test_config/test_tweens.py
+++ b/src/pyramid/tests/test_config/test_tweens.py
diff --git a/pyramid/tests/test_config/test_util.py b/src/pyramid/tests/test_config/test_util.py
index 540f3d14c..540f3d14c 100644
--- a/pyramid/tests/test_config/test_util.py
+++ b/src/pyramid/tests/test_config/test_util.py
diff --git a/pyramid/tests/test_config/test_views.py b/src/pyramid/tests/test_config/test_views.py
index 6565a35d5..6565a35d5 100644
--- a/pyramid/tests/test_config/test_views.py
+++ b/src/pyramid/tests/test_config/test_views.py
diff --git a/pyramid/tests/test_csrf.py b/src/pyramid/tests/test_csrf.py
index 234d4434c..234d4434c 100644
--- a/pyramid/tests/test_csrf.py
+++ b/src/pyramid/tests/test_csrf.py
diff --git a/pyramid/tests/test_decorator.py b/src/pyramid/tests/test_decorator.py
index 4b9313e06..4b9313e06 100644
--- a/pyramid/tests/test_decorator.py
+++ b/src/pyramid/tests/test_decorator.py
diff --git a/pyramid/tests/test_docs.py b/src/pyramid/tests/test_docs.py
index 0735a494a..0735a494a 100644
--- a/pyramid/tests/test_docs.py
+++ b/src/pyramid/tests/test_docs.py
diff --git a/pyramid/tests/test_encode.py b/src/pyramid/tests/test_encode.py
index d3a9f7095..d3a9f7095 100644
--- a/pyramid/tests/test_encode.py
+++ b/src/pyramid/tests/test_encode.py
diff --git a/pyramid/tests/test_events.py b/src/pyramid/tests/test_events.py
index 793ac329f..793ac329f 100644
--- a/pyramid/tests/test_events.py
+++ b/src/pyramid/tests/test_events.py
diff --git a/pyramid/tests/test_exceptions.py b/src/pyramid/tests/test_exceptions.py
index 9cb0f58d1..9cb0f58d1 100644
--- a/pyramid/tests/test_exceptions.py
+++ b/src/pyramid/tests/test_exceptions.py
diff --git a/pyramid/tests/test_httpexceptions.py b/src/pyramid/tests/test_httpexceptions.py
index ed6c41e0e..ed6c41e0e 100644
--- a/pyramid/tests/test_httpexceptions.py
+++ b/src/pyramid/tests/test_httpexceptions.py
diff --git a/pyramid/tests/test_i18n.py b/src/pyramid/tests/test_i18n.py
index d72d0d480..d72d0d480 100644
--- a/pyramid/tests/test_i18n.py
+++ b/src/pyramid/tests/test_i18n.py
diff --git a/pyramid/tests/test_integration.py b/src/pyramid/tests/test_integration.py
index eedc145ad..eedc145ad 100644
--- a/pyramid/tests/test_integration.py
+++ b/src/pyramid/tests/test_integration.py
diff --git a/pyramid/tests/test_location.py b/src/pyramid/tests/test_location.py
index e1f47f4ab..e1f47f4ab 100644
--- a/pyramid/tests/test_location.py
+++ b/src/pyramid/tests/test_location.py
diff --git a/pyramid/tests/test_paster.py b/src/pyramid/tests/test_paster.py
index 784458647..784458647 100644
--- a/pyramid/tests/test_paster.py
+++ b/src/pyramid/tests/test_paster.py
diff --git a/pyramid/tests/test_path.py b/src/pyramid/tests/test_path.py
index 563ece6d6..563ece6d6 100644
--- a/pyramid/tests/test_path.py
+++ b/src/pyramid/tests/test_path.py
diff --git a/pyramid/tests/test_predicates.py b/src/pyramid/tests/test_predicates.py
index da0b44708..da0b44708 100644
--- a/pyramid/tests/test_predicates.py
+++ b/src/pyramid/tests/test_predicates.py
diff --git a/pyramid/tests/test_registry.py b/src/pyramid/tests/test_registry.py
index aa44b5408..aa44b5408 100644
--- a/pyramid/tests/test_registry.py
+++ b/src/pyramid/tests/test_registry.py
diff --git a/pyramid/tests/test_renderers.py b/src/pyramid/tests/test_renderers.py
index a2f7bf8c2..a2f7bf8c2 100644
--- a/pyramid/tests/test_renderers.py
+++ b/src/pyramid/tests/test_renderers.py
diff --git a/pyramid/tests/test_request.py b/src/pyramid/tests/test_request.py
index c79c84d63..c79c84d63 100644
--- a/pyramid/tests/test_request.py
+++ b/src/pyramid/tests/test_request.py
diff --git a/pyramid/tests/test_response.py b/src/pyramid/tests/test_response.py
index 53e3ce17a..53e3ce17a 100644
--- a/pyramid/tests/test_response.py
+++ b/src/pyramid/tests/test_response.py
diff --git a/pyramid/tests/test_router.py b/src/pyramid/tests/test_router.py
index 6097018f0..6097018f0 100644
--- a/pyramid/tests/test_router.py
+++ b/src/pyramid/tests/test_router.py
diff --git a/pyramid/tests/test_scaffolds/__init__.py b/src/pyramid/tests/test_scaffolds/__init__.py
index 5bb534f79..5bb534f79 100644
--- a/pyramid/tests/test_scaffolds/__init__.py
+++ b/src/pyramid/tests/test_scaffolds/__init__.py
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/.badfile b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/.badfile
index e69de29bb..e69de29bb 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/.badfile
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/.badfile
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/__init__.py_tmpl b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/__init__.py_tmpl
index d763b2435..d763b2435 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/__init__.py_tmpl
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/__init__.py_tmpl
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/resources.py b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/resources.py
index 3d811895c..3d811895c 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/resources.py
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/resources.py
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/favicon.ico b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/favicon.ico
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/favicon.ico
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/footerbg.png b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/footerbg.png
index 1fbc873da..1fbc873da 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/footerbg.png
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/footerbg.png
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/headerbg.png b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/headerbg.png
index 0596f2020..0596f2020 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/headerbg.png
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/headerbg.png
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/ie6.css b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/ie6.css
index b7c8493d8..b7c8493d8 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/ie6.css
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/ie6.css
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/middlebg.png b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/middlebg.png
index 2369cfb7d..2369cfb7d 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/middlebg.png
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/middlebg.png
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/pylons.css b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/pylons.css
index c54499ddd..c54499ddd 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/pylons.css
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/pylons.css
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/pyramid-small.png b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/pyramid-small.png
index a5bc0ade7..a5bc0ade7 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/pyramid-small.png
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/pyramid-small.png
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/pyramid.png b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/pyramid.png
index 347e05549..347e05549 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/pyramid.png
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/pyramid.png
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/transparent.gif b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/transparent.gif
index 0341802e5..0341802e5 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/transparent.gif
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/static/transparent.gif
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/templates/mytemplate.pt_tmpl b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/templates/mytemplate.pt_tmpl
index f4d98ec29..f4d98ec29 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/templates/mytemplate.pt_tmpl
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/templates/mytemplate.pt_tmpl
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/test_no_content.py_tmpl b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/test_no_content.py_tmpl
index e69de29bb..e69de29bb 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/test_no_content.py_tmpl
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/test_no_content.py_tmpl
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/tests.py_tmpl b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/tests.py_tmpl
index 1627bf015..1627bf015 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/tests.py_tmpl
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/tests.py_tmpl
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/views.py_tmpl b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/views.py_tmpl
index 12ed8832d..12ed8832d 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/views.py_tmpl
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/+package+/views.py_tmpl
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/CHANGES.txt_tmpl b/src/pyramid/tests/test_scaffolds/fixture_scaffold/CHANGES.txt_tmpl
index 35a34f332..35a34f332 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/CHANGES.txt_tmpl
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/CHANGES.txt_tmpl
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/MANIFEST.in_tmpl b/src/pyramid/tests/test_scaffolds/fixture_scaffold/MANIFEST.in_tmpl
index 0ff6eb7a0..0ff6eb7a0 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/MANIFEST.in_tmpl
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/MANIFEST.in_tmpl
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/README.txt_tmpl b/src/pyramid/tests/test_scaffolds/fixture_scaffold/README.txt_tmpl
index 40f98d14a..40f98d14a 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/README.txt_tmpl
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/README.txt_tmpl
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/development.ini_tmpl b/src/pyramid/tests/test_scaffolds/fixture_scaffold/development.ini_tmpl
index 01c504f99..01c504f99 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/development.ini_tmpl
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/development.ini_tmpl
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/production.ini_tmpl b/src/pyramid/tests/test_scaffolds/fixture_scaffold/production.ini_tmpl
index becd3aa76..becd3aa76 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/production.ini_tmpl
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/production.ini_tmpl
diff --git a/pyramid/tests/test_scaffolds/fixture_scaffold/setup.py_tmpl b/src/pyramid/tests/test_scaffolds/fixture_scaffold/setup.py_tmpl
index ee9fd5fda..ee9fd5fda 100644
--- a/pyramid/tests/test_scaffolds/fixture_scaffold/setup.py_tmpl
+++ b/src/pyramid/tests/test_scaffolds/fixture_scaffold/setup.py_tmpl
diff --git a/pyramid/tests/test_scaffolds/test_copydir.py b/src/pyramid/tests/test_scaffolds/test_copydir.py
index 1e92b3c36..1e92b3c36 100644
--- a/pyramid/tests/test_scaffolds/test_copydir.py
+++ b/src/pyramid/tests/test_scaffolds/test_copydir.py
diff --git a/pyramid/tests/test_scaffolds/test_init.py b/src/pyramid/tests/test_scaffolds/test_init.py
index f4d1b287a..f4d1b287a 100644
--- a/pyramid/tests/test_scaffolds/test_init.py
+++ b/src/pyramid/tests/test_scaffolds/test_init.py
diff --git a/pyramid/tests/test_scaffolds/test_template.py b/src/pyramid/tests/test_scaffolds/test_template.py
index 98f2daf73..98f2daf73 100644
--- a/pyramid/tests/test_scaffolds/test_template.py
+++ b/src/pyramid/tests/test_scaffolds/test_template.py
diff --git a/pyramid/tests/test_scripting.py b/src/pyramid/tests/test_scripting.py
index ed88bb470..ed88bb470 100644
--- a/pyramid/tests/test_scripting.py
+++ b/src/pyramid/tests/test_scripting.py
diff --git a/pyramid/tests/test_scripts/__init__.py b/src/pyramid/tests/test_scripts/__init__.py
index 5bb534f79..5bb534f79 100644
--- a/pyramid/tests/test_scripts/__init__.py
+++ b/src/pyramid/tests/test_scripts/__init__.py
diff --git a/pyramid/tests/test_scripts/dummy.py b/src/pyramid/tests/test_scripts/dummy.py
index f1ef403f8..f1ef403f8 100644
--- a/pyramid/tests/test_scripts/dummy.py
+++ b/src/pyramid/tests/test_scripts/dummy.py
diff --git a/pyramid/tests/test_scripts/pystartup.txt b/src/pyramid/tests/test_scripts/pystartup.txt
index c62c4ca74..c62c4ca74 100644
--- a/pyramid/tests/test_scripts/pystartup.txt
+++ b/src/pyramid/tests/test_scripts/pystartup.txt
diff --git a/pyramid/tests/test_scripts/test_common.py b/src/pyramid/tests/test_scripts/test_common.py
index 60741db92..60741db92 100644
--- a/pyramid/tests/test_scripts/test_common.py
+++ b/src/pyramid/tests/test_scripts/test_common.py
diff --git a/pyramid/tests/test_scripts/test_pcreate.py b/src/pyramid/tests/test_scripts/test_pcreate.py
index 0286614ce..0286614ce 100644
--- a/pyramid/tests/test_scripts/test_pcreate.py
+++ b/src/pyramid/tests/test_scripts/test_pcreate.py
diff --git a/pyramid/tests/test_scripts/test_pdistreport.py b/src/pyramid/tests/test_scripts/test_pdistreport.py
index e229667c5..e229667c5 100644
--- a/pyramid/tests/test_scripts/test_pdistreport.py
+++ b/src/pyramid/tests/test_scripts/test_pdistreport.py
diff --git a/pyramid/tests/test_scripts/test_prequest.py b/src/pyramid/tests/test_scripts/test_prequest.py
index 75d5cc198..75d5cc198 100644
--- a/pyramid/tests/test_scripts/test_prequest.py
+++ b/src/pyramid/tests/test_scripts/test_prequest.py
diff --git a/pyramid/tests/test_scripts/test_proutes.py b/src/pyramid/tests/test_scripts/test_proutes.py
index fab5e163e..fab5e163e 100644
--- a/pyramid/tests/test_scripts/test_proutes.py
+++ b/src/pyramid/tests/test_scripts/test_proutes.py
diff --git a/pyramid/tests/test_scripts/test_pserve.py b/src/pyramid/tests/test_scripts/test_pserve.py
index 485cf38cb..485cf38cb 100644
--- a/pyramid/tests/test_scripts/test_pserve.py
+++ b/src/pyramid/tests/test_scripts/test_pserve.py
diff --git a/pyramid/tests/test_scripts/test_pshell.py b/src/pyramid/tests/test_scripts/test_pshell.py
index df664bea9..df664bea9 100644
--- a/pyramid/tests/test_scripts/test_pshell.py
+++ b/src/pyramid/tests/test_scripts/test_pshell.py
diff --git a/pyramid/tests/test_scripts/test_ptweens.py b/src/pyramid/tests/test_scripts/test_ptweens.py
index 6907b858d..6907b858d 100644
--- a/pyramid/tests/test_scripts/test_ptweens.py
+++ b/src/pyramid/tests/test_scripts/test_ptweens.py
diff --git a/pyramid/tests/test_scripts/test_pviews.py b/src/pyramid/tests/test_scripts/test_pviews.py
index 6ec9defbd..6ec9defbd 100644
--- a/pyramid/tests/test_scripts/test_pviews.py
+++ b/src/pyramid/tests/test_scripts/test_pviews.py
diff --git a/pyramid/tests/test_security.py b/src/pyramid/tests/test_security.py
index e5399ecdf..e5399ecdf 100644
--- a/pyramid/tests/test_security.py
+++ b/src/pyramid/tests/test_security.py
diff --git a/pyramid/tests/test_session.py b/src/pyramid/tests/test_session.py
index 3585ed635..3585ed635 100644
--- a/pyramid/tests/test_session.py
+++ b/src/pyramid/tests/test_session.py
diff --git a/pyramid/tests/test_settings.py b/src/pyramid/tests/test_settings.py
index a586cb6fd..a586cb6fd 100644
--- a/pyramid/tests/test_settings.py
+++ b/src/pyramid/tests/test_settings.py
diff --git a/pyramid/tests/test_static.py b/src/pyramid/tests/test_static.py
index f76cc5067..f76cc5067 100644
--- a/pyramid/tests/test_static.py
+++ b/src/pyramid/tests/test_static.py
diff --git a/pyramid/tests/test_testing.py b/src/pyramid/tests/test_testing.py
index 86c219988..86c219988 100644
--- a/pyramid/tests/test_testing.py
+++ b/src/pyramid/tests/test_testing.py
diff --git a/pyramid/tests/test_threadlocal.py b/src/pyramid/tests/test_threadlocal.py
index 088156507..088156507 100644
--- a/pyramid/tests/test_threadlocal.py
+++ b/src/pyramid/tests/test_threadlocal.py
diff --git a/pyramid/tests/test_traversal.py b/src/pyramid/tests/test_traversal.py
index 437fe46df..437fe46df 100644
--- a/pyramid/tests/test_traversal.py
+++ b/src/pyramid/tests/test_traversal.py
diff --git a/pyramid/tests/test_tweens.py b/src/pyramid/tests/test_tweens.py
index 2e74ad7cf..2e74ad7cf 100644
--- a/pyramid/tests/test_tweens.py
+++ b/src/pyramid/tests/test_tweens.py
diff --git a/pyramid/tests/test_url.py b/src/pyramid/tests/test_url.py
index 31b3dd571..31b3dd571 100644
--- a/pyramid/tests/test_url.py
+++ b/src/pyramid/tests/test_url.py
diff --git a/pyramid/tests/test_urldispatch.py b/src/pyramid/tests/test_urldispatch.py
index 06f4ad793..06f4ad793 100644
--- a/pyramid/tests/test_urldispatch.py
+++ b/src/pyramid/tests/test_urldispatch.py
diff --git a/pyramid/tests/test_util.py b/src/pyramid/tests/test_util.py
index a76cd2017..a76cd2017 100644
--- a/pyramid/tests/test_util.py
+++ b/src/pyramid/tests/test_util.py
diff --git a/pyramid/tests/test_view.py b/src/pyramid/tests/test_view.py
index 3344bd739..3344bd739 100644
--- a/pyramid/tests/test_view.py
+++ b/src/pyramid/tests/test_view.py
diff --git a/pyramid/tests/test_viewderivers.py b/src/pyramid/tests/test_viewderivers.py
index 6b81cc1e5..6b81cc1e5 100644
--- a/pyramid/tests/test_viewderivers.py
+++ b/src/pyramid/tests/test_viewderivers.py
diff --git a/pyramid/tests/test_wsgi.py b/src/pyramid/tests/test_wsgi.py
index 4ddbc9201..4ddbc9201 100644
--- a/pyramid/tests/test_wsgi.py
+++ b/src/pyramid/tests/test_wsgi.py
diff --git a/pyramid/threadlocal.py b/src/pyramid/threadlocal.py
index e8f825715..e8f825715 100644
--- a/pyramid/threadlocal.py
+++ b/src/pyramid/threadlocal.py
diff --git a/pyramid/traversal.py b/src/pyramid/traversal.py
index d8f4690fd..d8f4690fd 100644
--- a/pyramid/traversal.py
+++ b/src/pyramid/traversal.py
diff --git a/pyramid/tweens.py b/src/pyramid/tweens.py
index 740b6961c..740b6961c 100644
--- a/pyramid/tweens.py
+++ b/src/pyramid/tweens.py
diff --git a/pyramid/url.py b/src/pyramid/url.py
index 852aa5e55..852aa5e55 100644
--- a/pyramid/url.py
+++ b/src/pyramid/url.py
diff --git a/pyramid/urldispatch.py b/src/pyramid/urldispatch.py
index a61071845..a61071845 100644
--- a/pyramid/urldispatch.py
+++ b/src/pyramid/urldispatch.py
diff --git a/pyramid/util.py b/src/pyramid/util.py
index 6655455bf..6655455bf 100644
--- a/pyramid/util.py
+++ b/src/pyramid/util.py
diff --git a/pyramid/view.py b/src/pyramid/view.py
index 769328344..769328344 100644
--- a/pyramid/view.py
+++ b/src/pyramid/view.py
diff --git a/pyramid/viewderivers.py b/src/pyramid/viewderivers.py
index d914a4752..d914a4752 100644
--- a/pyramid/viewderivers.py
+++ b/src/pyramid/viewderivers.py
diff --git a/pyramid/wsgi.py b/src/pyramid/wsgi.py
index 1c1bded32..1c1bded32 100644
--- a/pyramid/wsgi.py
+++ b/src/pyramid/wsgi.py