first pass at converting bfg to pyramid namespace

201 files changed, 6 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..9f06987a3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.egg
+*.egg-info
+*.pyc
+*.pt.py
+*.txt.py
+
diff --git a/repoze/bfg/__init__.py b/pyramid/__init__.py
index f33bdbc35..f33bdbc35 100644
--- a/repoze/bfg/__init__.py
+++ b/pyramid/__init__.py
diff --git a/repoze/bfg/authentication.py b/pyramid/authentication.py
index 54e106af5..54e106af5 100644
--- a/repoze/bfg/authentication.py
+++ b/pyramid/authentication.py
diff --git a/repoze/bfg/authorization.py b/pyramid/authorization.py
index 8c46b4a33..8c46b4a33 100644
--- a/repoze/bfg/authorization.py
+++ b/pyramid/authorization.py
diff --git a/repoze/bfg/chameleon_text.py b/pyramid/chameleon_text.py
index 4a9d2655e..4a9d2655e 100644
--- a/repoze/bfg/chameleon_text.py
+++ b/pyramid/chameleon_text.py
diff --git a/repoze/bfg/chameleon_zpt.py b/pyramid/chameleon_zpt.py
index 3c1c59f1c..3c1c59f1c 100644
--- a/repoze/bfg/chameleon_zpt.py
+++ b/pyramid/chameleon_zpt.py
diff --git a/repoze/bfg/compat/__init__.py b/pyramid/compat/__init__.py
index 205175132..205175132 100644
--- a/repoze/bfg/compat/__init__.py
+++ b/pyramid/compat/__init__.py
diff --git a/repoze/bfg/configuration.py b/pyramid/configuration.py
index 88bdcba58..88bdcba58 100644
--- a/repoze/bfg/configuration.py
+++ b/pyramid/configuration.py
diff --git a/repoze/bfg/decorator.py b/pyramid/decorator.py
index 98d7b36b5..98d7b36b5 100644
--- a/repoze/bfg/decorator.py
+++ b/pyramid/decorator.py
diff --git a/repoze/bfg/encode.py b/pyramid/encode.py
index 127c405ed..127c405ed 100644
--- a/repoze/bfg/encode.py
+++ b/pyramid/encode.py
diff --git a/repoze/bfg/events.py b/pyramid/events.py
index efcbdf61f..efcbdf61f 100644
--- a/repoze/bfg/events.py
+++ b/pyramid/events.py
diff --git a/repoze/bfg/exceptions.py b/pyramid/exceptions.py
index 9b885d9dc..9b885d9dc 100644
--- a/repoze/bfg/exceptions.py
+++ b/pyramid/exceptions.py
diff --git a/repoze/bfg/i18n.py b/pyramid/i18n.py
index c3ba7efad..c3ba7efad 100644
--- a/repoze/bfg/i18n.py
+++ b/pyramid/i18n.py
diff --git a/repoze/bfg/includes/__init__.py b/pyramid/includes/__init__.py
index 9faa798e8..9faa798e8 100644
--- a/repoze/bfg/includes/__init__.py
+++ b/pyramid/includes/__init__.py
diff --git a/repoze/bfg/includes/configure.zcml b/pyramid/includes/configure.zcml
index 6a373fa5d..6a373fa5d 100644
--- a/repoze/bfg/includes/configure.zcml
+++ b/pyramid/includes/configure.zcml
diff --git a/repoze/bfg/includes/meta.zcml b/pyramid/includes/meta.zcml
index 58ab1c782..58ab1c782 100644
--- a/repoze/bfg/includes/meta.zcml
+++ b/pyramid/includes/meta.zcml
diff --git a/repoze/bfg/interfaces.py b/pyramid/interfaces.py
index d67fd2dfb..d67fd2dfb 100644
--- a/repoze/bfg/interfaces.py
+++ b/pyramid/interfaces.py
diff --git a/repoze/bfg/location.py b/pyramid/location.py
index 7472129d2..7472129d2 100644
--- a/repoze/bfg/location.py
+++ b/pyramid/location.py
diff --git a/repoze/bfg/log.py b/pyramid/log.py
index b8762e6e2..b8762e6e2 100644
--- a/repoze/bfg/log.py
+++ b/pyramid/log.py
diff --git a/repoze/bfg/paster.py b/pyramid/paster.py
index e8ce46ce2..e8ce46ce2 100644
--- a/repoze/bfg/paster.py
+++ b/pyramid/paster.py
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/__init__.py b/pyramid/paster_templates/alchemy/+package+/__init__.py
index cbdfd3ac6..cbdfd3ac6 100755
--- a/repoze/bfg/paster_templates/alchemy/+package+/__init__.py
+++ b/pyramid/paster_templates/alchemy/+package+/__init__.py
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/configure.zcml b/pyramid/paster_templates/alchemy/+package+/configure.zcml
index 521f06ba4..521f06ba4 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/configure.zcml
+++ b/pyramid/paster_templates/alchemy/+package+/configure.zcml
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/models.py b/pyramid/paster_templates/alchemy/+package+/models.py
index 336613cf9..336613cf9 100755
--- a/repoze/bfg/paster_templates/alchemy/+package+/models.py
+++ b/pyramid/paster_templates/alchemy/+package+/models.py
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/run.py_tmpl b/pyramid/paster_templates/alchemy/+package+/run.py_tmpl
index 026505f3a..026505f3a 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/run.py_tmpl
+++ b/pyramid/paster_templates/alchemy/+package+/run.py_tmpl
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/templates/model.pt b/pyramid/paster_templates/alchemy/+package+/templates/model.pt
index e29b92836..e29b92836 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/templates/model.pt
+++ b/pyramid/paster_templates/alchemy/+package+/templates/model.pt
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/templates/root.pt b/pyramid/paster_templates/alchemy/+package+/templates/root.pt
index 2cac6fe6e..2cac6fe6e 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/templates/root.pt
+++ b/pyramid/paster_templates/alchemy/+package+/templates/root.pt
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/default.css b/pyramid/paster_templates/alchemy/+package+/templates/static/default.css
index 41b3debde..41b3debde 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/default.css
+++ b/pyramid/paster_templates/alchemy/+package+/templates/static/default.css
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/images/img01.gif b/pyramid/paster_templates/alchemy/+package+/templates/static/images/img01.gif
index 5f082bd99..5f082bd99 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/images/img01.gif
+++ b/pyramid/paster_templates/alchemy/+package+/templates/static/images/img01.gif
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/images/img02.gif b/pyramid/paster_templates/alchemy/+package+/templates/static/images/img02.gif
index 45a3ae976..45a3ae976 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/images/img02.gif
+++ b/pyramid/paster_templates/alchemy/+package+/templates/static/images/img02.gif
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/images/img03.gif b/pyramid/paster_templates/alchemy/+package+/templates/static/images/img03.gif
index d92ea38f9..d92ea38f9 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/images/img03.gif
+++ b/pyramid/paster_templates/alchemy/+package+/templates/static/images/img03.gif
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/images/img04.gif b/pyramid/paster_templates/alchemy/+package+/templates/static/images/img04.gif
index 950c4af9d..950c4af9d 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/images/img04.gif
+++ b/pyramid/paster_templates/alchemy/+package+/templates/static/images/img04.gif
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/images/spacer.gif b/pyramid/paster_templates/alchemy/+package+/templates/static/images/spacer.gif
index 5bfd67a2d..5bfd67a2d 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/images/spacer.gif
+++ b/pyramid/paster_templates/alchemy/+package+/templates/static/images/spacer.gif
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/templatelicense.txt b/pyramid/paster_templates/alchemy/+package+/templates/static/templatelicense.txt
index ccb6b06ab..ccb6b06ab 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/templates/static/templatelicense.txt
+++ b/pyramid/paster_templates/alchemy/+package+/templates/static/templatelicense.txt
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/views.py_tmpl b/pyramid/paster_templates/alchemy/+package+/views.py_tmpl
index 12bce138e..12bce138e 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/views.py_tmpl
+++ b/pyramid/paster_templates/alchemy/+package+/views.py_tmpl
diff --git a/repoze/bfg/paster_templates/alchemy/+project+.ini_tmpl b/pyramid/paster_templates/alchemy/+project+.ini_tmpl
index 8260104d5..8260104d5 100644
--- a/repoze/bfg/paster_templates/alchemy/+project+.ini_tmpl
+++ b/pyramid/paster_templates/alchemy/+project+.ini_tmpl
diff --git a/repoze/bfg/paster_templates/alchemy/CHANGES.txt_tmpl b/pyramid/paster_templates/alchemy/CHANGES.txt_tmpl
index 5b34f7803..5b34f7803 100644
--- a/repoze/bfg/paster_templates/alchemy/CHANGES.txt_tmpl
+++ b/pyramid/paster_templates/alchemy/CHANGES.txt_tmpl
diff --git a/repoze/bfg/paster_templates/alchemy/README.txt_tmpl b/pyramid/paster_templates/alchemy/README.txt_tmpl
index 0ddebfc3e..0ddebfc3e 100644
--- a/repoze/bfg/paster_templates/alchemy/README.txt_tmpl
+++ b/pyramid/paster_templates/alchemy/README.txt_tmpl
diff --git a/repoze/bfg/paster_templates/alchemy/setup.cfg_tmpl b/pyramid/paster_templates/alchemy/setup.cfg_tmpl
index 5bec29823..5bec29823 100644
--- a/repoze/bfg/paster_templates/alchemy/setup.cfg_tmpl
+++ b/pyramid/paster_templates/alchemy/setup.cfg_tmpl
diff --git a/repoze/bfg/paster_templates/alchemy/setup.py_tmpl b/pyramid/paster_templates/alchemy/setup.py_tmpl
index 9446964e5..9446964e5 100644
--- a/repoze/bfg/paster_templates/alchemy/setup.py_tmpl
+++ b/pyramid/paster_templates/alchemy/setup.py_tmpl
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/__init__.py b/pyramid/paster_templates/routesalchemy/+package+/__init__.py
index cbdfd3ac6..cbdfd3ac6 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/__init__.py
+++ b/pyramid/paster_templates/routesalchemy/+package+/__init__.py
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/configure.zcml b/pyramid/paster_templates/routesalchemy/+package+/configure.zcml
index 6d16bd089..6d16bd089 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/configure.zcml
+++ b/pyramid/paster_templates/routesalchemy/+package+/configure.zcml
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/models.py b/pyramid/paster_templates/routesalchemy/+package+/models.py
index a1726ebf4..a1726ebf4 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/models.py
+++ b/pyramid/paster_templates/routesalchemy/+package+/models.py
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/run.py_tmpl b/pyramid/paster_templates/routesalchemy/+package+/run.py_tmpl
index b85f57556..b85f57556 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/run.py_tmpl
+++ b/pyramid/paster_templates/routesalchemy/+package+/run.py_tmpl
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/mytemplate.pt b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt
index 2aedcad9f..2aedcad9f 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/mytemplate.pt
+++ b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/default.css b/pyramid/paster_templates/routesalchemy/+package+/templates/static/default.css
index 41b3debde..41b3debde 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/default.css
+++ b/pyramid/paster_templates/routesalchemy/+package+/templates/static/default.css
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/images/img01.gif b/pyramid/paster_templates/routesalchemy/+package+/templates/static/images/img01.gif
index 5f082bd99..5f082bd99 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/images/img01.gif
+++ b/pyramid/paster_templates/routesalchemy/+package+/templates/static/images/img01.gif
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/images/img02.gif b/pyramid/paster_templates/routesalchemy/+package+/templates/static/images/img02.gif
index 45a3ae976..45a3ae976 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/images/img02.gif
+++ b/pyramid/paster_templates/routesalchemy/+package+/templates/static/images/img02.gif
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/images/img03.gif b/pyramid/paster_templates/routesalchemy/+package+/templates/static/images/img03.gif
index d92ea38f9..d92ea38f9 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/images/img03.gif
+++ b/pyramid/paster_templates/routesalchemy/+package+/templates/static/images/img03.gif
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/images/img04.gif b/pyramid/paster_templates/routesalchemy/+package+/templates/static/images/img04.gif
index 950c4af9d..950c4af9d 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/images/img04.gif
+++ b/pyramid/paster_templates/routesalchemy/+package+/templates/static/images/img04.gif
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/images/spacer.gif b/pyramid/paster_templates/routesalchemy/+package+/templates/static/images/spacer.gif
index 5bfd67a2d..5bfd67a2d 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/images/spacer.gif
+++ b/pyramid/paster_templates/routesalchemy/+package+/templates/static/images/spacer.gif
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/templatelicense.txt b/pyramid/paster_templates/routesalchemy/+package+/templates/static/templatelicense.txt
index ccb6b06ab..ccb6b06ab 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/templates/static/templatelicense.txt
+++ b/pyramid/paster_templates/routesalchemy/+package+/templates/static/templatelicense.txt
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/tests.py_tmpl b/pyramid/paster_templates/routesalchemy/+package+/tests.py_tmpl
index ed7f1280b..ed7f1280b 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/tests.py_tmpl
+++ b/pyramid/paster_templates/routesalchemy/+package+/tests.py_tmpl
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/views.py_tmpl b/pyramid/paster_templates/routesalchemy/+package+/views.py_tmpl
index 86cc02e41..86cc02e41 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/views.py_tmpl
+++ b/pyramid/paster_templates/routesalchemy/+package+/views.py_tmpl
diff --git a/repoze/bfg/paster_templates/routesalchemy/+project+.ini_tmpl b/pyramid/paster_templates/routesalchemy/+project+.ini_tmpl
index 8260104d5..8260104d5 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+project+.ini_tmpl
+++ b/pyramid/paster_templates/routesalchemy/+project+.ini_tmpl
diff --git a/repoze/bfg/paster_templates/routesalchemy/CHANGES.txt_tmpl b/pyramid/paster_templates/routesalchemy/CHANGES.txt_tmpl
index 35a34f332..35a34f332 100644
--- a/repoze/bfg/paster_templates/routesalchemy/CHANGES.txt_tmpl
+++ b/pyramid/paster_templates/routesalchemy/CHANGES.txt_tmpl
diff --git a/repoze/bfg/paster_templates/routesalchemy/README.txt_tmpl b/pyramid/paster_templates/routesalchemy/README.txt_tmpl
index 0ddebfc3e..0ddebfc3e 100644
--- a/repoze/bfg/paster_templates/routesalchemy/README.txt_tmpl
+++ b/pyramid/paster_templates/routesalchemy/README.txt_tmpl
diff --git a/repoze/bfg/paster_templates/routesalchemy/setup.cfg_tmpl b/pyramid/paster_templates/routesalchemy/setup.cfg_tmpl
index 5bec29823..5bec29823 100644
--- a/repoze/bfg/paster_templates/routesalchemy/setup.cfg_tmpl
+++ b/pyramid/paster_templates/routesalchemy/setup.cfg_tmpl
diff --git a/repoze/bfg/paster_templates/routesalchemy/setup.py_tmpl b/pyramid/paster_templates/routesalchemy/setup.py_tmpl
index 0ce1b8bad..0ce1b8bad 100644
--- a/repoze/bfg/paster_templates/routesalchemy/setup.py_tmpl
+++ b/pyramid/paster_templates/routesalchemy/setup.py_tmpl
diff --git a/repoze/bfg/paster_templates/starter/+package+/__init__.py b/pyramid/paster_templates/starter/+package+/__init__.py
index cbdfd3ac6..cbdfd3ac6 100644
--- a/repoze/bfg/paster_templates/starter/+package+/__init__.py
+++ b/pyramid/paster_templates/starter/+package+/__init__.py
diff --git a/repoze/bfg/paster_templates/starter/+package+/configure.zcml b/pyramid/paster_templates/starter/+package+/configure.zcml
index e83dd3933..e83dd3933 100644
--- a/repoze/bfg/paster_templates/starter/+package+/configure.zcml
+++ b/pyramid/paster_templates/starter/+package+/configure.zcml
diff --git a/repoze/bfg/paster_templates/starter/+package+/models.py b/pyramid/paster_templates/starter/+package+/models.py
index 75dec7505..75dec7505 100644
--- a/repoze/bfg/paster_templates/starter/+package+/models.py
+++ b/pyramid/paster_templates/starter/+package+/models.py
diff --git a/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl b/pyramid/paster_templates/starter/+package+/run.py_tmpl
index 74876f3f4..74876f3f4 100644
--- a/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl
+++ b/pyramid/paster_templates/starter/+package+/run.py_tmpl
diff --git a/repoze/bfg/paster_templates/starter/+package+/templates/mytemplate.pt b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt
index 2aedcad9f..2aedcad9f 100644
--- a/repoze/bfg/paster_templates/starter/+package+/templates/mytemplate.pt
+++ b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt
diff --git a/repoze/bfg/paster_templates/starter/+package+/templates/static/default.css b/pyramid/paster_templates/starter/+package+/templates/static/default.css
index 41b3debde..41b3debde 100644
--- a/repoze/bfg/paster_templates/starter/+package+/templates/static/default.css
+++ b/pyramid/paster_templates/starter/+package+/templates/static/default.css
diff --git a/repoze/bfg/paster_templates/starter/+package+/templates/static/images/img01.gif b/pyramid/paster_templates/starter/+package+/templates/static/images/img01.gif
index 5f082bd99..5f082bd99 100644
--- a/repoze/bfg/paster_templates/starter/+package+/templates/static/images/img01.gif
+++ b/pyramid/paster_templates/starter/+package+/templates/static/images/img01.gif
diff --git a/repoze/bfg/paster_templates/starter/+package+/templates/static/images/img02.gif b/pyramid/paster_templates/starter/+package+/templates/static/images/img02.gif
index 45a3ae976..45a3ae976 100644
--- a/repoze/bfg/paster_templates/starter/+package+/templates/static/images/img02.gif
+++ b/pyramid/paster_templates/starter/+package+/templates/static/images/img02.gif
diff --git a/repoze/bfg/paster_templates/starter/+package+/templates/static/images/img03.gif b/pyramid/paster_templates/starter/+package+/templates/static/images/img03.gif
index d92ea38f9..d92ea38f9 100644
--- a/repoze/bfg/paster_templates/starter/+package+/templates/static/images/img03.gif
+++ b/pyramid/paster_templates/starter/+package+/templates/static/images/img03.gif
diff --git a/repoze/bfg/paster_templates/starter/+package+/templates/static/images/img04.gif b/pyramid/paster_templates/starter/+package+/templates/static/images/img04.gif
index 950c4af9d..950c4af9d 100644
--- a/repoze/bfg/paster_templates/starter/+package+/templates/static/images/img04.gif
+++ b/pyramid/paster_templates/starter/+package+/templates/static/images/img04.gif
diff --git a/repoze/bfg/paster_templates/starter/+package+/templates/static/images/spacer.gif b/pyramid/paster_templates/starter/+package+/templates/static/images/spacer.gif
index 5bfd67a2d..5bfd67a2d 100644
--- a/repoze/bfg/paster_templates/starter/+package+/templates/static/images/spacer.gif
+++ b/pyramid/paster_templates/starter/+package+/templates/static/images/spacer.gif
diff --git a/repoze/bfg/paster_templates/starter/+package+/templates/static/templatelicense.txt b/pyramid/paster_templates/starter/+package+/templates/static/templatelicense.txt
index ccb6b06ab..ccb6b06ab 100644
--- a/repoze/bfg/paster_templates/starter/+package+/templates/static/templatelicense.txt
+++ b/pyramid/paster_templates/starter/+package+/templates/static/templatelicense.txt
diff --git a/repoze/bfg/paster_templates/starter/+package+/tests.py_tmpl b/pyramid/paster_templates/starter/+package+/tests.py_tmpl
index 578a58d35..578a58d35 100644
--- a/repoze/bfg/paster_templates/starter/+package+/tests.py_tmpl
+++ b/pyramid/paster_templates/starter/+package+/tests.py_tmpl
diff --git a/repoze/bfg/paster_templates/starter/+package+/views.py_tmpl b/pyramid/paster_templates/starter/+package+/views.py_tmpl
index 12ed8832d..12ed8832d 100644
--- a/repoze/bfg/paster_templates/starter/+package+/views.py_tmpl
+++ b/pyramid/paster_templates/starter/+package+/views.py_tmpl
diff --git a/repoze/bfg/paster_templates/starter/+project+.ini_tmpl b/pyramid/paster_templates/starter/+project+.ini_tmpl
index 9bdeec1ae..9bdeec1ae 100644
--- a/repoze/bfg/paster_templates/starter/+project+.ini_tmpl
+++ b/pyramid/paster_templates/starter/+project+.ini_tmpl
diff --git a/repoze/bfg/paster_templates/starter/CHANGES.txt_tmpl b/pyramid/paster_templates/starter/CHANGES.txt_tmpl
index 35a34f332..35a34f332 100644
--- a/repoze/bfg/paster_templates/starter/CHANGES.txt_tmpl
+++ b/pyramid/paster_templates/starter/CHANGES.txt_tmpl
diff --git a/repoze/bfg/paster_templates/starter/README.txt_tmpl b/pyramid/paster_templates/starter/README.txt_tmpl
index 0ddebfc3e..0ddebfc3e 100644
--- a/repoze/bfg/paster_templates/starter/README.txt_tmpl
+++ b/pyramid/paster_templates/starter/README.txt_tmpl
diff --git a/repoze/bfg/paster_templates/starter/setup.cfg_tmpl b/pyramid/paster_templates/starter/setup.cfg_tmpl
index 5bec29823..5bec29823 100644
--- a/repoze/bfg/paster_templates/starter/setup.cfg_tmpl
+++ b/pyramid/paster_templates/starter/setup.cfg_tmpl
diff --git a/repoze/bfg/paster_templates/starter/setup.py_tmpl b/pyramid/paster_templates/starter/setup.py_tmpl
index df1206c1e..df1206c1e 100644
--- a/repoze/bfg/paster_templates/starter/setup.py_tmpl
+++ b/pyramid/paster_templates/starter/setup.py_tmpl
diff --git a/repoze/bfg/paster_templates/zodb/+package+/__init__.py b/pyramid/paster_templates/zodb/+package+/__init__.py
index cbdfd3ac6..cbdfd3ac6 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/__init__.py
+++ b/pyramid/paster_templates/zodb/+package+/__init__.py
diff --git a/repoze/bfg/paster_templates/zodb/+package+/configure.zcml b/pyramid/paster_templates/zodb/+package+/configure.zcml
index e83dd3933..e83dd3933 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/configure.zcml
+++ b/pyramid/paster_templates/zodb/+package+/configure.zcml
diff --git a/repoze/bfg/paster_templates/zodb/+package+/models.py b/pyramid/paster_templates/zodb/+package+/models.py
index 8dd0f5a49..8dd0f5a49 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/models.py
+++ b/pyramid/paster_templates/zodb/+package+/models.py
diff --git a/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl b/pyramid/paster_templates/zodb/+package+/run.py_tmpl
index c0a245089..c0a245089 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl
+++ b/pyramid/paster_templates/zodb/+package+/run.py_tmpl
diff --git a/repoze/bfg/paster_templates/zodb/+package+/templates/mytemplate.pt b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt
index 2aedcad9f..2aedcad9f 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/templates/mytemplate.pt
+++ b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt
diff --git a/repoze/bfg/paster_templates/zodb/+package+/templates/static/default.css b/pyramid/paster_templates/zodb/+package+/templates/static/default.css
index 41b3debde..41b3debde 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/templates/static/default.css
+++ b/pyramid/paster_templates/zodb/+package+/templates/static/default.css
diff --git a/repoze/bfg/paster_templates/zodb/+package+/templates/static/images/img01.gif b/pyramid/paster_templates/zodb/+package+/templates/static/images/img01.gif
index 5f082bd99..5f082bd99 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/templates/static/images/img01.gif
+++ b/pyramid/paster_templates/zodb/+package+/templates/static/images/img01.gif
diff --git a/repoze/bfg/paster_templates/zodb/+package+/templates/static/images/img02.gif b/pyramid/paster_templates/zodb/+package+/templates/static/images/img02.gif
index 45a3ae976..45a3ae976 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/templates/static/images/img02.gif
+++ b/pyramid/paster_templates/zodb/+package+/templates/static/images/img02.gif
diff --git a/repoze/bfg/paster_templates/zodb/+package+/templates/static/images/img03.gif b/pyramid/paster_templates/zodb/+package+/templates/static/images/img03.gif
index d92ea38f9..d92ea38f9 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/templates/static/images/img03.gif
+++ b/pyramid/paster_templates/zodb/+package+/templates/static/images/img03.gif
diff --git a/repoze/bfg/paster_templates/zodb/+package+/templates/static/images/img04.gif b/pyramid/paster_templates/zodb/+package+/templates/static/images/img04.gif
index 950c4af9d..950c4af9d 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/templates/static/images/img04.gif
+++ b/pyramid/paster_templates/zodb/+package+/templates/static/images/img04.gif
diff --git a/repoze/bfg/paster_templates/zodb/+package+/templates/static/images/spacer.gif b/pyramid/paster_templates/zodb/+package+/templates/static/images/spacer.gif
index 5bfd67a2d..5bfd67a2d 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/templates/static/images/spacer.gif
+++ b/pyramid/paster_templates/zodb/+package+/templates/static/images/spacer.gif
diff --git a/repoze/bfg/paster_templates/zodb/+package+/templates/static/templatelicense.txt b/pyramid/paster_templates/zodb/+package+/templates/static/templatelicense.txt
index ccb6b06ab..ccb6b06ab 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/templates/static/templatelicense.txt
+++ b/pyramid/paster_templates/zodb/+package+/templates/static/templatelicense.txt
diff --git a/repoze/bfg/paster_templates/zodb/+package+/tests.py_tmpl b/pyramid/paster_templates/zodb/+package+/tests.py_tmpl
index 30da5c9b3..30da5c9b3 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/tests.py_tmpl
+++ b/pyramid/paster_templates/zodb/+package+/tests.py_tmpl
diff --git a/repoze/bfg/paster_templates/zodb/+package+/views.py_tmpl b/pyramid/paster_templates/zodb/+package+/views.py_tmpl
index 12ed8832d..12ed8832d 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/views.py_tmpl
+++ b/pyramid/paster_templates/zodb/+package+/views.py_tmpl
diff --git a/repoze/bfg/paster_templates/zodb/+project+.ini_tmpl b/pyramid/paster_templates/zodb/+project+.ini_tmpl
index 993cec596..993cec596 100644
--- a/repoze/bfg/paster_templates/zodb/+project+.ini_tmpl
+++ b/pyramid/paster_templates/zodb/+project+.ini_tmpl
diff --git a/repoze/bfg/paster_templates/zodb/CHANGES.txt_tmpl b/pyramid/paster_templates/zodb/CHANGES.txt_tmpl
index 35a34f332..35a34f332 100644
--- a/repoze/bfg/paster_templates/zodb/CHANGES.txt_tmpl
+++ b/pyramid/paster_templates/zodb/CHANGES.txt_tmpl
diff --git a/repoze/bfg/paster_templates/zodb/README.txt_tmpl b/pyramid/paster_templates/zodb/README.txt_tmpl
index 0ddebfc3e..0ddebfc3e 100644
--- a/repoze/bfg/paster_templates/zodb/README.txt_tmpl
+++ b/pyramid/paster_templates/zodb/README.txt_tmpl
diff --git a/repoze/bfg/paster_templates/zodb/setup.cfg_tmpl b/pyramid/paster_templates/zodb/setup.cfg_tmpl
index 5bec29823..5bec29823 100644
--- a/repoze/bfg/paster_templates/zodb/setup.cfg_tmpl
+++ b/pyramid/paster_templates/zodb/setup.cfg_tmpl
diff --git a/repoze/bfg/paster_templates/zodb/setup.py_tmpl b/pyramid/paster_templates/zodb/setup.py_tmpl
index dba0e4ac7..dba0e4ac7 100644
--- a/repoze/bfg/paster_templates/zodb/setup.py_tmpl
+++ b/pyramid/paster_templates/zodb/setup.py_tmpl
diff --git a/repoze/bfg/path.py b/pyramid/path.py
index b5850968f..b5850968f 100644
--- a/repoze/bfg/path.py
+++ b/pyramid/path.py
diff --git a/repoze/bfg/registry.py b/pyramid/registry.py
index e935ac165..e935ac165 100644
--- a/repoze/bfg/registry.py
+++ b/pyramid/registry.py
diff --git a/repoze/bfg/renderers.py b/pyramid/renderers.py
index 00413e3fe..00413e3fe 100644
--- a/repoze/bfg/renderers.py
+++ b/pyramid/renderers.py
diff --git a/repoze/bfg/request.py b/pyramid/request.py
index f32a7a40c..f32a7a40c 100644
--- a/repoze/bfg/request.py
+++ b/pyramid/request.py
diff --git a/repoze/bfg/resource.py b/pyramid/resource.py
index da49f16ec..da49f16ec 100644
--- a/repoze/bfg/resource.py
+++ b/pyramid/resource.py
diff --git a/repoze/bfg/router.py b/pyramid/router.py
index 7b3bcb75e..7b3bcb75e 100644
--- a/repoze/bfg/router.py
+++ b/pyramid/router.py
diff --git a/repoze/bfg/scripting.py b/pyramid/scripting.py
index ca0bea597..ca0bea597 100644
--- a/repoze/bfg/scripting.py
+++ b/pyramid/scripting.py
diff --git a/repoze/bfg/security.py b/pyramid/security.py
index cd1bae9a5..cd1bae9a5 100644
--- a/repoze/bfg/security.py
+++ b/pyramid/security.py
diff --git a/repoze/bfg/settings.py b/pyramid/settings.py
index 5e1181809..5e1181809 100644
--- a/repoze/bfg/settings.py
+++ b/pyramid/settings.py
diff --git a/repoze/bfg/static.py b/pyramid/static.py
index 71db132b7..71db132b7 100644
--- a/repoze/bfg/static.py
+++ b/pyramid/static.py
diff --git a/repoze/bfg/testing.py b/pyramid/testing.py
index c99ba8706..c99ba8706 100644
--- a/repoze/bfg/testing.py
+++ b/pyramid/testing.py
diff --git a/repoze/bfg/tests/__init__.py b/pyramid/tests/__init__.py
index 5bb534f79..5bb534f79 100644
--- a/repoze/bfg/tests/__init__.py
+++ b/pyramid/tests/__init__.py
diff --git a/repoze/bfg/tests/ccbugapp/__init__.py b/pyramid/tests/ccbugapp/__init__.py
index 546616b2c..546616b2c 100644
--- a/repoze/bfg/tests/ccbugapp/__init__.py
+++ b/pyramid/tests/ccbugapp/__init__.py
diff --git a/repoze/bfg/tests/ccbugapp/configure.zcml b/pyramid/tests/ccbugapp/configure.zcml
index cb9ca6f1d..cb9ca6f1d 100644
--- a/repoze/bfg/tests/ccbugapp/configure.zcml
+++ b/pyramid/tests/ccbugapp/configure.zcml
diff --git a/repoze/bfg/tests/ccbugapp/views.py b/pyramid/tests/ccbugapp/views.py
index 4a6939ac2..4a6939ac2 100644
--- a/repoze/bfg/tests/ccbugapp/views.py
+++ b/pyramid/tests/ccbugapp/views.py
diff --git a/repoze/bfg/tests/exceptionviewapp/__init__.py b/pyramid/tests/exceptionviewapp/__init__.py
index ef5fe8b12..ef5fe8b12 100644
--- a/repoze/bfg/tests/exceptionviewapp/__init__.py
+++ b/pyramid/tests/exceptionviewapp/__init__.py
diff --git a/repoze/bfg/tests/exceptionviewapp/configure.zcml b/pyramid/tests/exceptionviewapp/configure.zcml
index 680e065a6..680e065a6 100644
--- a/repoze/bfg/tests/exceptionviewapp/configure.zcml
+++ b/pyramid/tests/exceptionviewapp/configure.zcml
diff --git a/repoze/bfg/tests/exceptionviewapp/models.py b/pyramid/tests/exceptionviewapp/models.py
index fe407badc..fe407badc 100644
--- a/repoze/bfg/tests/exceptionviewapp/models.py
+++ b/pyramid/tests/exceptionviewapp/models.py
diff --git a/repoze/bfg/tests/exceptionviewapp/views.py b/pyramid/tests/exceptionviewapp/views.py
index 1432618cf..1432618cf 100644
--- a/repoze/bfg/tests/exceptionviewapp/views.py
+++ b/pyramid/tests/exceptionviewapp/views.py
diff --git a/repoze/bfg/tests/fixtureapp/__init__.py b/pyramid/tests/fixtureapp/__init__.py
index 546616b2c..546616b2c 100644
--- a/repoze/bfg/tests/fixtureapp/__init__.py
+++ b/pyramid/tests/fixtureapp/__init__.py
diff --git a/repoze/bfg/tests/fixtureapp/another.zcml b/pyramid/tests/fixtureapp/another.zcml
index f8678bad7..f8678bad7 100644
--- a/repoze/bfg/tests/fixtureapp/another.zcml
+++ b/pyramid/tests/fixtureapp/another.zcml
diff --git a/repoze/bfg/tests/fixtureapp/configure.zcml b/pyramid/tests/fixtureapp/configure.zcml
index e3470d47a..e3470d47a 100644
--- a/repoze/bfg/tests/fixtureapp/configure.zcml
+++ b/pyramid/tests/fixtureapp/configure.zcml
diff --git a/repoze/bfg/tests/fixtureapp/models.py b/pyramid/tests/fixtureapp/models.py
index d80d14bb3..d80d14bb3 100644
--- a/repoze/bfg/tests/fixtureapp/models.py
+++ b/pyramid/tests/fixtureapp/models.py
diff --git a/repoze/bfg/tests/fixtureapp/subpackage/__init__.py b/pyramid/tests/fixtureapp/subpackage/__init__.py
index d3173e636..d3173e636 100644
--- a/repoze/bfg/tests/fixtureapp/subpackage/__init__.py
+++ b/pyramid/tests/fixtureapp/subpackage/__init__.py
diff --git a/repoze/bfg/tests/fixtureapp/subpackage/templates/bar.pt b/pyramid/tests/fixtureapp/subpackage/templates/bar.pt
index 90531a4b3..90531a4b3 100644
--- a/repoze/bfg/tests/fixtureapp/subpackage/templates/bar.pt
+++ b/pyramid/tests/fixtureapp/subpackage/templates/bar.pt
diff --git a/repoze/bfg/tests/fixtureapp/subpackage/yetanother.zcml b/pyramid/tests/fixtureapp/subpackage/yetanother.zcml
index 464163477..464163477 100644
--- a/repoze/bfg/tests/fixtureapp/subpackage/yetanother.zcml
+++ b/pyramid/tests/fixtureapp/subpackage/yetanother.zcml
diff --git a/repoze/bfg/tests/fixtureapp/templates/fixture.pt b/pyramid/tests/fixtureapp/templates/fixture.pt
index 06dd4e2b1..06dd4e2b1 100644
--- a/repoze/bfg/tests/fixtureapp/templates/fixture.pt
+++ b/pyramid/tests/fixtureapp/templates/fixture.pt
diff --git a/repoze/bfg/tests/fixtureapp/views.py b/pyramid/tests/fixtureapp/views.py
index 862046d43..862046d43 100644
--- a/repoze/bfg/tests/fixtureapp/views.py
+++ b/pyramid/tests/fixtureapp/views.py
diff --git a/repoze/bfg/tests/fixtures/minimal.pt b/pyramid/tests/fixtures/minimal.pt
index 693d155ef..693d155ef 100644
--- a/repoze/bfg/tests/fixtures/minimal.pt
+++ b/pyramid/tests/fixtures/minimal.pt
diff --git a/repoze/bfg/tests/fixtures/minimal.txt b/pyramid/tests/fixtures/minimal.txt
index 18832d351..18832d351 100644
--- a/repoze/bfg/tests/fixtures/minimal.txt
+++ b/pyramid/tests/fixtures/minimal.txt
diff --git a/repoze/bfg/tests/fixtures/nonminimal.txt b/pyramid/tests/fixtures/nonminimal.txt
index 9de95ec92..9de95ec92 100644
--- a/repoze/bfg/tests/fixtures/nonminimal.txt
+++ b/pyramid/tests/fixtures/nonminimal.txt
diff --git a/repoze/bfg/tests/fixtures/pp.pt b/pyramid/tests/fixtures/pp.pt
index 9df7d22da..9df7d22da 100644
--- a/repoze/bfg/tests/fixtures/pp.pt
+++ b/pyramid/tests/fixtures/pp.pt
diff --git a/repoze/bfg/tests/fixtures/static/index.html b/pyramid/tests/fixtures/static/index.html
index 6498787a5..6498787a5 100644
--- a/repoze/bfg/tests/fixtures/static/index.html
+++ b/pyramid/tests/fixtures/static/index.html
diff --git a/repoze/bfg/tests/fixtures/static/subdir/index.html b/pyramid/tests/fixtures/static/subdir/index.html
index bb84fad04..bb84fad04 100644
--- a/repoze/bfg/tests/fixtures/static/subdir/index.html
+++ b/pyramid/tests/fixtures/static/subdir/index.html
diff --git a/repoze/bfg/tests/grokkedapp/__init__.py b/pyramid/tests/grokkedapp/__init__.py
index 5d2843885..5d2843885 100644
--- a/repoze/bfg/tests/grokkedapp/__init__.py
+++ b/pyramid/tests/grokkedapp/__init__.py
diff --git a/repoze/bfg/tests/grokkedapp/another.py b/pyramid/tests/grokkedapp/another.py
index 7dda1d579..7dda1d579 100644
--- a/repoze/bfg/tests/grokkedapp/another.py
+++ b/pyramid/tests/grokkedapp/another.py
diff --git a/repoze/bfg/tests/grokkedapp/configure.zcml b/pyramid/tests/grokkedapp/configure.zcml
index 6867046df..6867046df 100644
--- a/repoze/bfg/tests/grokkedapp/configure.zcml
+++ b/pyramid/tests/grokkedapp/configure.zcml
diff --git a/repoze/bfg/tests/grokkedapp/pod/notinit.py b/pyramid/tests/grokkedapp/pod/notinit.py
index ca0538123..ca0538123 100644
--- a/repoze/bfg/tests/grokkedapp/pod/notinit.py
+++ b/pyramid/tests/grokkedapp/pod/notinit.py
diff --git a/repoze/bfg/tests/grokkedapp/subpackage/__init__.py b/pyramid/tests/grokkedapp/subpackage/__init__.py
index bdbe54e13..bdbe54e13 100644
--- a/repoze/bfg/tests/grokkedapp/subpackage/__init__.py
+++ b/pyramid/tests/grokkedapp/subpackage/__init__.py
diff --git a/repoze/bfg/tests/grokkedapp/subpackage/notinit.py b/pyramid/tests/grokkedapp/subpackage/notinit.py
index 84de6503d..84de6503d 100644
--- a/repoze/bfg/tests/grokkedapp/subpackage/notinit.py
+++ b/pyramid/tests/grokkedapp/subpackage/notinit.py
diff --git a/repoze/bfg/tests/grokkedapp/subpackage/subsubpackage/__init__.py b/pyramid/tests/grokkedapp/subpackage/subsubpackage/__init__.py
index a83be850b..a83be850b 100644
--- a/repoze/bfg/tests/grokkedapp/subpackage/subsubpackage/__init__.py
+++ b/pyramid/tests/grokkedapp/subpackage/subsubpackage/__init__.py
diff --git a/repoze/bfg/tests/hybridapp/__init__.py b/pyramid/tests/hybridapp/__init__.py
index 5bb534f79..5bb534f79 100644
--- a/repoze/bfg/tests/hybridapp/__init__.py
+++ b/pyramid/tests/hybridapp/__init__.py
diff --git a/repoze/bfg/tests/hybridapp/configure.zcml b/pyramid/tests/hybridapp/configure.zcml
index a94409e26..a94409e26 100644
--- a/repoze/bfg/tests/hybridapp/configure.zcml
+++ b/pyramid/tests/hybridapp/configure.zcml
diff --git a/repoze/bfg/tests/hybridapp/views.py b/pyramid/tests/hybridapp/views.py
index 135ef8290..135ef8290 100644
--- a/repoze/bfg/tests/hybridapp/views.py
+++ b/pyramid/tests/hybridapp/views.py
diff --git a/repoze/bfg/tests/localeapp/__init__.py b/pyramid/tests/localeapp/__init__.py
index 1a35cdb4a..1a35cdb4a 100644
--- a/repoze/bfg/tests/localeapp/__init__.py
+++ b/pyramid/tests/localeapp/__init__.py
diff --git a/repoze/bfg/tests/localeapp/locale/GARBAGE b/pyramid/tests/localeapp/locale/GARBAGE
index 032c55584..032c55584 100644
--- a/repoze/bfg/tests/localeapp/locale/GARBAGE
+++ b/pyramid/tests/localeapp/locale/GARBAGE
diff --git a/repoze/bfg/tests/localeapp/locale/be/LC_MESSAGES b/pyramid/tests/localeapp/locale/be/LC_MESSAGES
index 909cf6a3b..909cf6a3b 100644
--- a/repoze/bfg/tests/localeapp/locale/be/LC_MESSAGES
+++ b/pyramid/tests/localeapp/locale/be/LC_MESSAGES
diff --git a/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo b/pyramid/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo
index 2924a5eb5..2924a5eb5 100644
--- a/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo
+++ b/pyramid/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo
diff --git a/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po b/pyramid/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po
index 17f87bc19..17f87bc19 100644
--- a/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po
+++ b/pyramid/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po
diff --git a/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo b/pyramid/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo
index 2924a5eb5..2924a5eb5 100644
--- a/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo
+++ b/pyramid/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo
diff --git a/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po b/pyramid/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po
index 17f87bc19..17f87bc19 100644
--- a/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po
+++ b/pyramid/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po
diff --git a/repoze/bfg/tests/restbugapp/__init__.py b/pyramid/tests/restbugapp/__init__.py
index 5bb534f79..5bb534f79 100644
--- a/repoze/bfg/tests/restbugapp/__init__.py
+++ b/pyramid/tests/restbugapp/__init__.py
diff --git a/repoze/bfg/tests/restbugapp/configure.zcml b/pyramid/tests/restbugapp/configure.zcml
index 67954b892..67954b892 100644
--- a/repoze/bfg/tests/restbugapp/configure.zcml
+++ b/pyramid/tests/restbugapp/configure.zcml
diff --git a/repoze/bfg/tests/restbugapp/views.py b/pyramid/tests/restbugapp/views.py
index b94851099..b94851099 100644
--- a/repoze/bfg/tests/restbugapp/views.py
+++ b/pyramid/tests/restbugapp/views.py
diff --git a/repoze/bfg/tests/routesapp/__init__.py b/pyramid/tests/routesapp/__init__.py
index 546616b2c..546616b2c 100644
--- a/repoze/bfg/tests/routesapp/__init__.py
+++ b/pyramid/tests/routesapp/__init__.py
diff --git a/repoze/bfg/tests/routesapp/configure.zcml b/pyramid/tests/routesapp/configure.zcml
index 01062b6d4..01062b6d4 100644
--- a/repoze/bfg/tests/routesapp/configure.zcml
+++ b/pyramid/tests/routesapp/configure.zcml
diff --git a/repoze/bfg/tests/routesapp/models.py b/pyramid/tests/routesapp/models.py
index a57b06308..a57b06308 100644
--- a/repoze/bfg/tests/routesapp/models.py
+++ b/pyramid/tests/routesapp/models.py
diff --git a/repoze/bfg/tests/routesapp/templates/fixture.pt b/pyramid/tests/routesapp/templates/fixture.pt
index 06dd4e2b1..06dd4e2b1 100644
--- a/repoze/bfg/tests/routesapp/templates/fixture.pt
+++ b/pyramid/tests/routesapp/templates/fixture.pt
diff --git a/repoze/bfg/tests/routesapp/views.py b/pyramid/tests/routesapp/views.py
index f805b88c9..f805b88c9 100644
--- a/repoze/bfg/tests/routesapp/views.py
+++ b/pyramid/tests/routesapp/views.py
diff --git a/repoze/bfg/tests/test_authentication.py b/pyramid/tests/test_authentication.py
index d020a11a6..d020a11a6 100644
--- a/repoze/bfg/tests/test_authentication.py
+++ b/pyramid/tests/test_authentication.py
diff --git a/repoze/bfg/tests/test_authorization.py b/pyramid/tests/test_authorization.py
index 6b8c8293a..6b8c8293a 100644
--- a/repoze/bfg/tests/test_authorization.py
+++ b/pyramid/tests/test_authorization.py
diff --git a/repoze/bfg/tests/test_chameleon_text.py b/pyramid/tests/test_chameleon_text.py
index d9cefbd67..d9cefbd67 100644
--- a/repoze/bfg/tests/test_chameleon_text.py
+++ b/pyramid/tests/test_chameleon_text.py
diff --git a/repoze/bfg/tests/test_chameleon_zpt.py b/pyramid/tests/test_chameleon_zpt.py
index a0f01701a..a0f01701a 100644
--- a/repoze/bfg/tests/test_chameleon_zpt.py
+++ b/pyramid/tests/test_chameleon_zpt.py
diff --git a/repoze/bfg/tests/test_compat.py b/pyramid/tests/test_compat.py
index 66ea61860..66ea61860 100644
--- a/repoze/bfg/tests/test_compat.py
+++ b/pyramid/tests/test_compat.py
diff --git a/repoze/bfg/tests/test_configuration.py b/pyramid/tests/test_configuration.py
index 47649d6ba..47649d6ba 100644
--- a/repoze/bfg/tests/test_configuration.py
+++ b/pyramid/tests/test_configuration.py
diff --git a/repoze/bfg/tests/test_decorator.py b/pyramid/tests/test_decorator.py
index d41c62c65..d41c62c65 100644
--- a/repoze/bfg/tests/test_decorator.py
+++ b/pyramid/tests/test_decorator.py
diff --git a/repoze/bfg/tests/test_docs.py b/pyramid/tests/test_docs.py
index a00171842..a00171842 100644
--- a/repoze/bfg/tests/test_docs.py
+++ b/pyramid/tests/test_docs.py
diff --git a/repoze/bfg/tests/test_encode.py b/pyramid/tests/test_encode.py
index 364247fb3..364247fb3 100644
--- a/repoze/bfg/tests/test_encode.py
+++ b/pyramid/tests/test_encode.py
diff --git a/repoze/bfg/tests/test_events.py b/pyramid/tests/test_events.py
index d097ca0f4..d097ca0f4 100644
--- a/repoze/bfg/tests/test_events.py
+++ b/pyramid/tests/test_events.py
diff --git a/repoze/bfg/tests/test_exceptions.py b/pyramid/tests/test_exceptions.py
index 4091eb941..4091eb941 100644
--- a/repoze/bfg/tests/test_exceptions.py
+++ b/pyramid/tests/test_exceptions.py
diff --git a/repoze/bfg/tests/test_i18n.py b/pyramid/tests/test_i18n.py
index 95017807f..95017807f 100644
--- a/repoze/bfg/tests/test_i18n.py
+++ b/pyramid/tests/test_i18n.py
diff --git a/repoze/bfg/tests/test_integration.py b/pyramid/tests/test_integration.py
index b6eb860ee..b6eb860ee 100644
--- a/repoze/bfg/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
diff --git a/repoze/bfg/tests/test_location.py b/pyramid/tests/test_location.py
index 9b8360f8b..9b8360f8b 100644
--- a/repoze/bfg/tests/test_location.py
+++ b/pyramid/tests/test_location.py
diff --git a/repoze/bfg/tests/test_log.py b/pyramid/tests/test_log.py
index 4cc8d12a0..4cc8d12a0 100644
--- a/repoze/bfg/tests/test_log.py
+++ b/pyramid/tests/test_log.py
diff --git a/repoze/bfg/tests/test_paster.py b/pyramid/tests/test_paster.py
index 43837b5f0..43837b5f0 100644
--- a/repoze/bfg/tests/test_paster.py
+++ b/pyramid/tests/test_paster.py
diff --git a/repoze/bfg/tests/test_path.py b/pyramid/tests/test_path.py
index 8ee0474f9..8ee0474f9 100644
--- a/repoze/bfg/tests/test_path.py
+++ b/pyramid/tests/test_path.py
diff --git a/repoze/bfg/tests/test_registry.py b/pyramid/tests/test_registry.py
index b6185964a..b6185964a 100644
--- a/repoze/bfg/tests/test_registry.py
+++ b/pyramid/tests/test_registry.py
diff --git a/repoze/bfg/tests/test_renderers.py b/pyramid/tests/test_renderers.py
index 264b4a547..264b4a547 100644
--- a/repoze/bfg/tests/test_renderers.py
+++ b/pyramid/tests/test_renderers.py
diff --git a/repoze/bfg/tests/test_request.py b/pyramid/tests/test_request.py
index f1874d60a..f1874d60a 100644
--- a/repoze/bfg/tests/test_request.py
+++ b/pyramid/tests/test_request.py
diff --git a/repoze/bfg/tests/test_resource.py b/pyramid/tests/test_resource.py
index 191d72c8b..191d72c8b 100644
--- a/repoze/bfg/tests/test_resource.py
+++ b/pyramid/tests/test_resource.py
diff --git a/repoze/bfg/tests/test_router.py b/pyramid/tests/test_router.py
index fade0679b..fade0679b 100644
--- a/repoze/bfg/tests/test_router.py
+++ b/pyramid/tests/test_router.py
diff --git a/repoze/bfg/tests/test_scripting.py b/pyramid/tests/test_scripting.py
index 2663c4a0f..2663c4a0f 100644
--- a/repoze/bfg/tests/test_scripting.py
+++ b/pyramid/tests/test_scripting.py
diff --git a/repoze/bfg/tests/test_security.py b/pyramid/tests/test_security.py
index 13a0e2d9b..13a0e2d9b 100644
--- a/repoze/bfg/tests/test_security.py
+++ b/pyramid/tests/test_security.py
diff --git a/repoze/bfg/tests/test_settings.py b/pyramid/tests/test_settings.py
index be73f9dce..be73f9dce 100644
--- a/repoze/bfg/tests/test_settings.py
+++ b/pyramid/tests/test_settings.py
diff --git a/repoze/bfg/tests/test_static.py b/pyramid/tests/test_static.py
index 449860883..449860883 100644
--- a/repoze/bfg/tests/test_static.py
+++ b/pyramid/tests/test_static.py
diff --git a/repoze/bfg/tests/test_testing.py b/pyramid/tests/test_testing.py
index b900a44a4..b900a44a4 100644
--- a/repoze/bfg/tests/test_testing.py
+++ b/pyramid/tests/test_testing.py
diff --git a/repoze/bfg/tests/test_threadlocal.py b/pyramid/tests/test_threadlocal.py
index 6bb18c4ff..6bb18c4ff 100644
--- a/repoze/bfg/tests/test_threadlocal.py
+++ b/pyramid/tests/test_threadlocal.py
diff --git a/repoze/bfg/tests/test_traversal.py b/pyramid/tests/test_traversal.py
index 1cae0a05f..1cae0a05f 100644
--- a/repoze/bfg/tests/test_traversal.py
+++ b/pyramid/tests/test_traversal.py
diff --git a/repoze/bfg/tests/test_url.py b/pyramid/tests/test_url.py
index 1b6f7814c..1b6f7814c 100644
--- a/repoze/bfg/tests/test_url.py
+++ b/pyramid/tests/test_url.py
diff --git a/repoze/bfg/tests/test_urldispatch.py b/pyramid/tests/test_urldispatch.py
index bf43750ea..bf43750ea 100644
--- a/repoze/bfg/tests/test_urldispatch.py
+++ b/pyramid/tests/test_urldispatch.py
diff --git a/repoze/bfg/tests/test_view.py b/pyramid/tests/test_view.py
index e5adc8de1..e5adc8de1 100644
--- a/repoze/bfg/tests/test_view.py
+++ b/pyramid/tests/test_view.py
diff --git a/repoze/bfg/tests/test_wsgi.py b/pyramid/tests/test_wsgi.py
index 5d3ec1faa..5d3ec1faa 100644
--- a/repoze/bfg/tests/test_wsgi.py
+++ b/pyramid/tests/test_wsgi.py
diff --git a/repoze/bfg/tests/test_zcml.py b/pyramid/tests/test_zcml.py
index 131122d7b..131122d7b 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/pyramid/tests/test_zcml.py
diff --git a/repoze/bfg/tests/viewdecoratorapp/__init__.py b/pyramid/tests/viewdecoratorapp/__init__.py
index 5bb534f79..5bb534f79 100644
--- a/repoze/bfg/tests/viewdecoratorapp/__init__.py
+++ b/pyramid/tests/viewdecoratorapp/__init__.py
diff --git a/repoze/bfg/tests/viewdecoratorapp/configure.zcml b/pyramid/tests/viewdecoratorapp/configure.zcml
index 6867046df..6867046df 100644
--- a/repoze/bfg/tests/viewdecoratorapp/configure.zcml
+++ b/pyramid/tests/viewdecoratorapp/configure.zcml
diff --git a/repoze/bfg/tests/viewdecoratorapp/views/__init__.py b/pyramid/tests/viewdecoratorapp/views/__init__.py
index 5bb534f79..5bb534f79 100644
--- a/repoze/bfg/tests/viewdecoratorapp/views/__init__.py
+++ b/pyramid/tests/viewdecoratorapp/views/__init__.py
diff --git a/repoze/bfg/tests/viewdecoratorapp/views/templates/foo.pt b/pyramid/tests/viewdecoratorapp/views/templates/foo.pt
index 6a2f701b6..6a2f701b6 100644
--- a/repoze/bfg/tests/viewdecoratorapp/views/templates/foo.pt
+++ b/pyramid/tests/viewdecoratorapp/views/templates/foo.pt
diff --git a/repoze/bfg/tests/viewdecoratorapp/views/views.py b/pyramid/tests/viewdecoratorapp/views/views.py
index 29f8c7fd4..29f8c7fd4 100644
--- a/repoze/bfg/tests/viewdecoratorapp/views/views.py
+++ b/pyramid/tests/viewdecoratorapp/views/views.py
diff --git a/repoze/bfg/threadlocal.py b/pyramid/threadlocal.py
index 631cca62a..631cca62a 100644
--- a/repoze/bfg/threadlocal.py
+++ b/pyramid/threadlocal.py
diff --git a/repoze/bfg/traversal.py b/pyramid/traversal.py
index 84365e2ff..84365e2ff 100644
--- a/repoze/bfg/traversal.py
+++ b/pyramid/traversal.py
diff --git a/repoze/bfg/url.py b/pyramid/url.py
index d1532f7ef..d1532f7ef 100644
--- a/repoze/bfg/url.py
+++ b/pyramid/url.py
diff --git a/repoze/bfg/urldispatch.py b/pyramid/urldispatch.py
index 8aca2c421..8aca2c421 100644
--- a/repoze/bfg/urldispatch.py
+++ b/pyramid/urldispatch.py
diff --git a/repoze/bfg/view.py b/pyramid/view.py
index c5fd60623..c5fd60623 100644
--- a/repoze/bfg/view.py
+++ b/pyramid/view.py
diff --git a/repoze/bfg/wsgi.py b/pyramid/wsgi.py
index c576253b3..c576253b3 100644
--- a/repoze/bfg/wsgi.py
+++ b/pyramid/wsgi.py
diff --git a/repoze/bfg/zcml.py b/pyramid/zcml.py
index 2bf394eb8..2bf394eb8 100644
--- a/repoze/bfg/zcml.py
+++ b/pyramid/zcml.py