rename 'paster_templates' to 'scaffolds', adjust references

91 files changed, 96 insertions, 91 deletions

diff --git a/pyramid/paster.py b/pyramid/paster.py
index f82246fea..28d3535df 100644
--- a/pyramid/paster.py
+++ b/pyramid/paster.py
@@ -4,48 +4,9 @@ from code import interact
 
 from paste.deploy import loadapp
 from paste.script.command import Command
-from paste.script.templates import Template
-from paste.util.template import paste_script_template_renderer
 
 from pyramid.scripting import get_root
 
-class PyramidTemplate(Template):
-    def pre(self, command, output_dir, vars):
-        vars['random_string'] = os.urandom(20).encode('hex')
-        package_logger = vars['package']
-        if package_logger == 'root':
-            # Rename the app logger in the rare case a project is named 'root'
-            package_logger = 'app'
-        vars['package_logger'] = package_logger
-        return Template.pre(self, command, output_dir, vars)
-
-    def post(self, command, output_dir, vars):
-        self.out('Welcome to Pyramid.  Sorry for the convenience.')
-        return Template.post(self, command, output_dir, vars)
-
-    def out(self, msg): # pragma: no cover (replaceable testing hook)
-        print msg
-
-class StarterProjectTemplate(PyramidTemplate):
-    _template_dir = 'paster_templates/starter'
-    summary = 'pyramid starter project'
-    template_renderer = staticmethod(paste_script_template_renderer)
-
-class ZODBProjectTemplate(PyramidTemplate):
-    _template_dir = 'paster_templates/zodb'
-    summary = 'pyramid ZODB starter project'
-    template_renderer = staticmethod(paste_script_template_renderer)
-
-class RoutesAlchemyProjectTemplate(PyramidTemplate):
-    _template_dir = 'paster_templates/routesalchemy'
-    summary = 'pyramid SQLAlchemy project using url dispatch (no traversal)'
-    template_renderer = staticmethod(paste_script_template_renderer)
-
-class AlchemyProjectTemplate(PyramidTemplate):
-    _template_dir = 'paster_templates/alchemy'
-    summary = 'pyramid SQLAlchemy project using traversal'
-    template_renderer = staticmethod(paste_script_template_renderer)
-
 def get_app(config_file, name, loadapp=loadapp):
     """ Return the WSGI application named ``name`` in the PasteDeploy
     config file ``config_file``"""
diff --git a/pyramid/scaffolds/__init__.py b/pyramid/scaffolds/__init__.py
new file mode 100644
index 000000000..a49bbd9f6
--- /dev/null
+++ b/pyramid/scaffolds/__init__.py
@@ -0,0 +1,42 @@
+import os
+
+from paste.script.templates import Template
+from paste.util.template import paste_script_template_renderer
+
+class PyramidTemplate(Template):
+    def pre(self, command, output_dir, vars):
+        vars['random_string'] = os.urandom(20).encode('hex')
+        package_logger = vars['package']
+        if package_logger == 'root':
+            # Rename the app logger in the rare case a project is named 'root'
+            package_logger = 'app'
+        vars['package_logger'] = package_logger
+        return Template.pre(self, command, output_dir, vars)
+
+    def post(self, command, output_dir, vars):
+        self.out('Welcome to Pyramid.  Sorry for the convenience.')
+        return Template.post(self, command, output_dir, vars)
+
+    def out(self, msg): # pragma: no cover (replaceable testing hook)
+        print msg
+
+class StarterProjectTemplate(PyramidTemplate):
+    _template_dir = 'starter'
+    summary = 'pyramid starter project'
+    template_renderer = staticmethod(paste_script_template_renderer)
+
+class ZODBProjectTemplate(PyramidTemplate):
+    _template_dir = 'zodb'
+    summary = 'pyramid ZODB starter project'
+    template_renderer = staticmethod(paste_script_template_renderer)
+
+class RoutesAlchemyProjectTemplate(PyramidTemplate):
+    _template_dir = 'routesalchemy'
+    summary = 'pyramid SQLAlchemy project using url dispatch (no traversal)'
+    template_renderer = staticmethod(paste_script_template_renderer)
+
+class AlchemyProjectTemplate(PyramidTemplate):
+    _template_dir = 'alchemy'
+    summary = 'pyramid SQLAlchemy project using traversal'
+    template_renderer = staticmethod(paste_script_template_renderer)
+
diff --git a/pyramid/paster_templates/alchemy/+package+/__init__.py_tmpl b/pyramid/scaffolds/alchemy/+package+/__init__.py_tmpl
index 8dfb3bf0a..8dfb3bf0a 100755
--- a/pyramid/paster_templates/alchemy/+package+/__init__.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/__init__.py_tmpl
diff --git a/pyramid/paster_templates/alchemy/+package+/models.py b/pyramid/scaffolds/alchemy/+package+/models.py
index f1b47f98c..f1b47f98c 100755
--- a/pyramid/paster_templates/alchemy/+package+/models.py
+++ b/pyramid/scaffolds/alchemy/+package+/models.py
diff --git a/pyramid/paster_templates/alchemy/+package+/static/favicon.ico b/pyramid/scaffolds/alchemy/+package+/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/pyramid/paster_templates/alchemy/+package+/static/favicon.ico
+++ b/pyramid/scaffolds/alchemy/+package+/static/favicon.ico
diff --git a/pyramid/paster_templates/alchemy/+package+/static/footerbg.png b/pyramid/scaffolds/alchemy/+package+/static/footerbg.png
index 1fbc873da..1fbc873da 100644
--- a/pyramid/paster_templates/alchemy/+package+/static/footerbg.png
+++ b/pyramid/scaffolds/alchemy/+package+/static/footerbg.png
diff --git a/pyramid/paster_templates/alchemy/+package+/static/headerbg.png b/pyramid/scaffolds/alchemy/+package+/static/headerbg.png
index 0596f2020..0596f2020 100644
--- a/pyramid/paster_templates/alchemy/+package+/static/headerbg.png
+++ b/pyramid/scaffolds/alchemy/+package+/static/headerbg.png
diff --git a/pyramid/paster_templates/alchemy/+package+/static/ie6.css b/pyramid/scaffolds/alchemy/+package+/static/ie6.css
index b7c8493d8..b7c8493d8 100644
--- a/pyramid/paster_templates/alchemy/+package+/static/ie6.css
+++ b/pyramid/scaffolds/alchemy/+package+/static/ie6.css
diff --git a/pyramid/paster_templates/alchemy/+package+/static/middlebg.png b/pyramid/scaffolds/alchemy/+package+/static/middlebg.png
index 2369cfb7d..2369cfb7d 100644
--- a/pyramid/paster_templates/alchemy/+package+/static/middlebg.png
+++ b/pyramid/scaffolds/alchemy/+package+/static/middlebg.png
diff --git a/pyramid/paster_templates/alchemy/+package+/static/pylons.css b/pyramid/scaffolds/alchemy/+package+/static/pylons.css
index d952fb42e..d952fb42e 100644
--- a/pyramid/paster_templates/alchemy/+package+/static/pylons.css
+++ b/pyramid/scaffolds/alchemy/+package+/static/pylons.css
diff --git a/pyramid/paster_templates/alchemy/+package+/static/pyramid-small.png b/pyramid/scaffolds/alchemy/+package+/static/pyramid-small.png
index a5bc0ade7..a5bc0ade7 100644
--- a/pyramid/paster_templates/alchemy/+package+/static/pyramid-small.png
+++ b/pyramid/scaffolds/alchemy/+package+/static/pyramid-small.png
diff --git a/pyramid/paster_templates/alchemy/+package+/static/pyramid.png b/pyramid/scaffolds/alchemy/+package+/static/pyramid.png
index 347e05549..347e05549 100644
--- a/pyramid/paster_templates/alchemy/+package+/static/pyramid.png
+++ b/pyramid/scaffolds/alchemy/+package+/static/pyramid.png
diff --git a/pyramid/paster_templates/alchemy/+package+/static/transparent.gif b/pyramid/scaffolds/alchemy/+package+/static/transparent.gif
index 0341802e5..0341802e5 100644
--- a/pyramid/paster_templates/alchemy/+package+/static/transparent.gif
+++ b/pyramid/scaffolds/alchemy/+package+/static/transparent.gif
diff --git a/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/model.pt_tmpl
index 9302326f5..9302326f5 100644
--- a/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/model.pt_tmpl
diff --git a/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/root.pt_tmpl
index b0ed476cc..b0ed476cc 100644
--- a/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/root.pt_tmpl
diff --git a/pyramid/paster_templates/alchemy/+package+/tests.py_tmpl b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
index c073bfc88..c073bfc88 100644
--- a/pyramid/paster_templates/alchemy/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
diff --git a/pyramid/paster_templates/alchemy/+package+/views.py_tmpl b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
index 12bce138e..12bce138e 100644
--- a/pyramid/paster_templates/alchemy/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
diff --git a/pyramid/paster_templates/alchemy/CHANGES.txt_tmpl b/pyramid/scaffolds/alchemy/CHANGES.txt_tmpl
index 5b34f7803..5b34f7803 100644
--- a/pyramid/paster_templates/alchemy/CHANGES.txt_tmpl
+++ b/pyramid/scaffolds/alchemy/CHANGES.txt_tmpl
diff --git a/pyramid/paster_templates/alchemy/MANIFEST.in_tmpl b/pyramid/scaffolds/alchemy/MANIFEST.in_tmpl
index 0ff6eb7a0..0ff6eb7a0 100644
--- a/pyramid/paster_templates/alchemy/MANIFEST.in_tmpl
+++ b/pyramid/scaffolds/alchemy/MANIFEST.in_tmpl
diff --git a/pyramid/paster_templates/alchemy/README.txt_tmpl b/pyramid/scaffolds/alchemy/README.txt_tmpl
index 0ddebfc3e..0ddebfc3e 100644
--- a/pyramid/paster_templates/alchemy/README.txt_tmpl
+++ b/pyramid/scaffolds/alchemy/README.txt_tmpl
diff --git a/pyramid/paster_templates/alchemy/development.ini_tmpl b/pyramid/scaffolds/alchemy/development.ini_tmpl
index accec1718..accec1718 100644
--- a/pyramid/paster_templates/alchemy/development.ini_tmpl
+++ b/pyramid/scaffolds/alchemy/development.ini_tmpl
diff --git a/pyramid/paster_templates/alchemy/production.ini_tmpl b/pyramid/scaffolds/alchemy/production.ini_tmpl
index 0deb1dd5f..0deb1dd5f 100644
--- a/pyramid/paster_templates/alchemy/production.ini_tmpl
+++ b/pyramid/scaffolds/alchemy/production.ini_tmpl
diff --git a/pyramid/paster_templates/alchemy/setup.cfg_tmpl b/pyramid/scaffolds/alchemy/setup.cfg_tmpl
index 5bec29823..5bec29823 100644
--- a/pyramid/paster_templates/alchemy/setup.cfg_tmpl
+++ b/pyramid/scaffolds/alchemy/setup.cfg_tmpl
diff --git a/pyramid/paster_templates/alchemy/setup.py_tmpl b/pyramid/scaffolds/alchemy/setup.py_tmpl
index 8e9da9755..8e9da9755 100644
--- a/pyramid/paster_templates/alchemy/setup.py_tmpl
+++ b/pyramid/scaffolds/alchemy/setup.py_tmpl
diff --git a/pyramid/paster_templates/routesalchemy/+package+/__init__.py_tmpl b/pyramid/scaffolds/routesalchemy/+package+/__init__.py_tmpl
index f5e3a0630..f5e3a0630 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/__init__.py_tmpl
+++ b/pyramid/scaffolds/routesalchemy/+package+/__init__.py_tmpl
diff --git a/pyramid/paster_templates/routesalchemy/+package+/models.py b/pyramid/scaffolds/routesalchemy/+package+/models.py
index a036e8c91..a036e8c91 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/models.py
+++ b/pyramid/scaffolds/routesalchemy/+package+/models.py
diff --git a/pyramid/paster_templates/routesalchemy/+package+/static/favicon.ico b/pyramid/scaffolds/routesalchemy/+package+/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/static/favicon.ico
+++ b/pyramid/scaffolds/routesalchemy/+package+/static/favicon.ico
diff --git a/pyramid/paster_templates/routesalchemy/+package+/static/footerbg.png b/pyramid/scaffolds/routesalchemy/+package+/static/footerbg.png
index 1fbc873da..1fbc873da 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/static/footerbg.png
+++ b/pyramid/scaffolds/routesalchemy/+package+/static/footerbg.png
diff --git a/pyramid/paster_templates/routesalchemy/+package+/static/headerbg.png b/pyramid/scaffolds/routesalchemy/+package+/static/headerbg.png
index 0596f2020..0596f2020 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/static/headerbg.png
+++ b/pyramid/scaffolds/routesalchemy/+package+/static/headerbg.png
diff --git a/pyramid/paster_templates/routesalchemy/+package+/static/ie6.css b/pyramid/scaffolds/routesalchemy/+package+/static/ie6.css
index b7c8493d8..b7c8493d8 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/static/ie6.css
+++ b/pyramid/scaffolds/routesalchemy/+package+/static/ie6.css
diff --git a/pyramid/paster_templates/routesalchemy/+package+/static/middlebg.png b/pyramid/scaffolds/routesalchemy/+package+/static/middlebg.png
index 2369cfb7d..2369cfb7d 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/static/middlebg.png
+++ b/pyramid/scaffolds/routesalchemy/+package+/static/middlebg.png
diff --git a/pyramid/paster_templates/routesalchemy/+package+/static/pylons.css b/pyramid/scaffolds/routesalchemy/+package+/static/pylons.css
index d952fb42e..d952fb42e 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/static/pylons.css
+++ b/pyramid/scaffolds/routesalchemy/+package+/static/pylons.css
diff --git a/pyramid/paster_templates/routesalchemy/+package+/static/pyramid-small.png b/pyramid/scaffolds/routesalchemy/+package+/static/pyramid-small.png
index a5bc0ade7..a5bc0ade7 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/static/pyramid-small.png
+++ b/pyramid/scaffolds/routesalchemy/+package+/static/pyramid-small.png
diff --git a/pyramid/paster_templates/routesalchemy/+package+/static/pyramid.png b/pyramid/scaffolds/routesalchemy/+package+/static/pyramid.png
index 347e05549..347e05549 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/static/pyramid.png
+++ b/pyramid/scaffolds/routesalchemy/+package+/static/pyramid.png
diff --git a/pyramid/paster_templates/routesalchemy/+package+/static/transparent.gif b/pyramid/scaffolds/routesalchemy/+package+/static/transparent.gif
index 0341802e5..0341802e5 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/static/transparent.gif
+++ b/pyramid/scaffolds/routesalchemy/+package+/static/transparent.gif
diff --git a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/routesalchemy/+package+/templates/mytemplate.pt_tmpl
index 4fbc554e9..4fbc554e9 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/routesalchemy/+package+/templates/mytemplate.pt_tmpl
diff --git a/pyramid/paster_templates/routesalchemy/+package+/tests.py_tmpl b/pyramid/scaffolds/routesalchemy/+package+/tests.py_tmpl
index 29aea7258..29aea7258 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/routesalchemy/+package+/tests.py_tmpl
diff --git a/pyramid/paster_templates/routesalchemy/+package+/views.py_tmpl b/pyramid/scaffolds/routesalchemy/+package+/views.py_tmpl
index 86cc02e41..86cc02e41 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/routesalchemy/+package+/views.py_tmpl
diff --git a/pyramid/paster_templates/routesalchemy/CHANGES.txt_tmpl b/pyramid/scaffolds/routesalchemy/CHANGES.txt_tmpl
index 35a34f332..35a34f332 100644
--- a/pyramid/paster_templates/routesalchemy/CHANGES.txt_tmpl
+++ b/pyramid/scaffolds/routesalchemy/CHANGES.txt_tmpl
diff --git a/pyramid/paster_templates/routesalchemy/MANIFEST.in_tmpl b/pyramid/scaffolds/routesalchemy/MANIFEST.in_tmpl
index 0ff6eb7a0..0ff6eb7a0 100644
--- a/pyramid/paster_templates/routesalchemy/MANIFEST.in_tmpl
+++ b/pyramid/scaffolds/routesalchemy/MANIFEST.in_tmpl
diff --git a/pyramid/paster_templates/routesalchemy/README.txt_tmpl b/pyramid/scaffolds/routesalchemy/README.txt_tmpl
index 0ddebfc3e..0ddebfc3e 100644
--- a/pyramid/paster_templates/routesalchemy/README.txt_tmpl
+++ b/pyramid/scaffolds/routesalchemy/README.txt_tmpl
diff --git a/pyramid/paster_templates/routesalchemy/development.ini_tmpl b/pyramid/scaffolds/routesalchemy/development.ini_tmpl
index accec1718..accec1718 100644
--- a/pyramid/paster_templates/routesalchemy/development.ini_tmpl
+++ b/pyramid/scaffolds/routesalchemy/development.ini_tmpl
diff --git a/pyramid/paster_templates/routesalchemy/production.ini_tmpl b/pyramid/scaffolds/routesalchemy/production.ini_tmpl
index 0deb1dd5f..0deb1dd5f 100644
--- a/pyramid/paster_templates/routesalchemy/production.ini_tmpl
+++ b/pyramid/scaffolds/routesalchemy/production.ini_tmpl
diff --git a/pyramid/paster_templates/routesalchemy/setup.cfg_tmpl b/pyramid/scaffolds/routesalchemy/setup.cfg_tmpl
index 5bec29823..5bec29823 100644
--- a/pyramid/paster_templates/routesalchemy/setup.cfg_tmpl
+++ b/pyramid/scaffolds/routesalchemy/setup.cfg_tmpl
diff --git a/pyramid/paster_templates/routesalchemy/setup.py_tmpl b/pyramid/scaffolds/routesalchemy/setup.py_tmpl
index 936a5dde0..936a5dde0 100644
--- a/pyramid/paster_templates/routesalchemy/setup.py_tmpl
+++ b/pyramid/scaffolds/routesalchemy/setup.py_tmpl
diff --git a/pyramid/paster_templates/starter/+package+/__init__.py_tmpl b/pyramid/scaffolds/starter/+package+/__init__.py_tmpl
index 3cfaa63a2..3cfaa63a2 100644
--- a/pyramid/paster_templates/starter/+package+/__init__.py_tmpl
+++ b/pyramid/scaffolds/starter/+package+/__init__.py_tmpl
diff --git a/pyramid/paster_templates/starter/+package+/resources.py b/pyramid/scaffolds/starter/+package+/resources.py
index 3d811895c..3d811895c 100644
--- a/pyramid/paster_templates/starter/+package+/resources.py
+++ b/pyramid/scaffolds/starter/+package+/resources.py
diff --git a/pyramid/paster_templates/starter/+package+/static/favicon.ico b/pyramid/scaffolds/starter/+package+/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/pyramid/paster_templates/starter/+package+/static/favicon.ico
+++ b/pyramid/scaffolds/starter/+package+/static/favicon.ico
diff --git a/pyramid/paster_templates/starter/+package+/static/footerbg.png b/pyramid/scaffolds/starter/+package+/static/footerbg.png
index 1fbc873da..1fbc873da 100644
--- a/pyramid/paster_templates/starter/+package+/static/footerbg.png
+++ b/pyramid/scaffolds/starter/+package+/static/footerbg.png
diff --git a/pyramid/paster_templates/starter/+package+/static/headerbg.png b/pyramid/scaffolds/starter/+package+/static/headerbg.png
index 0596f2020..0596f2020 100644
--- a/pyramid/paster_templates/starter/+package+/static/headerbg.png
+++ b/pyramid/scaffolds/starter/+package+/static/headerbg.png
diff --git a/pyramid/paster_templates/starter/+package+/static/ie6.css b/pyramid/scaffolds/starter/+package+/static/ie6.css
index b7c8493d8..b7c8493d8 100644
--- a/pyramid/paster_templates/starter/+package+/static/ie6.css
+++ b/pyramid/scaffolds/starter/+package+/static/ie6.css
diff --git a/pyramid/paster_templates/starter/+package+/static/middlebg.png b/pyramid/scaffolds/starter/+package+/static/middlebg.png
index 2369cfb7d..2369cfb7d 100644
--- a/pyramid/paster_templates/starter/+package+/static/middlebg.png
+++ b/pyramid/scaffolds/starter/+package+/static/middlebg.png
diff --git a/pyramid/paster_templates/starter/+package+/static/pylons.css b/pyramid/scaffolds/starter/+package+/static/pylons.css
index d952fb42e..d952fb42e 100644
--- a/pyramid/paster_templates/starter/+package+/static/pylons.css
+++ b/pyramid/scaffolds/starter/+package+/static/pylons.css
diff --git a/pyramid/paster_templates/starter/+package+/static/pyramid-small.png b/pyramid/scaffolds/starter/+package+/static/pyramid-small.png
index a5bc0ade7..a5bc0ade7 100644
--- a/pyramid/paster_templates/starter/+package+/static/pyramid-small.png
+++ b/pyramid/scaffolds/starter/+package+/static/pyramid-small.png
diff --git a/pyramid/paster_templates/starter/+package+/static/pyramid.png b/pyramid/scaffolds/starter/+package+/static/pyramid.png
index 347e05549..347e05549 100644
--- a/pyramid/paster_templates/starter/+package+/static/pyramid.png
+++ b/pyramid/scaffolds/starter/+package+/static/pyramid.png
diff --git a/pyramid/paster_templates/starter/+package+/static/transparent.gif b/pyramid/scaffolds/starter/+package+/static/transparent.gif
index 0341802e5..0341802e5 100644
--- a/pyramid/paster_templates/starter/+package+/static/transparent.gif
+++ b/pyramid/scaffolds/starter/+package+/static/transparent.gif
diff --git a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
index 4fbc554e9..4fbc554e9 100644
--- a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
diff --git a/pyramid/paster_templates/starter/+package+/tests.py_tmpl b/pyramid/scaffolds/starter/+package+/tests.py_tmpl
index 1627bf015..1627bf015 100644
--- a/pyramid/paster_templates/starter/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/starter/+package+/tests.py_tmpl
diff --git a/pyramid/paster_templates/starter/+package+/views.py_tmpl b/pyramid/scaffolds/starter/+package+/views.py_tmpl
index 12ed8832d..12ed8832d 100644
--- a/pyramid/paster_templates/starter/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/starter/+package+/views.py_tmpl
diff --git a/pyramid/paster_templates/starter/CHANGES.txt_tmpl b/pyramid/scaffolds/starter/CHANGES.txt_tmpl
index 35a34f332..35a34f332 100644
--- a/pyramid/paster_templates/starter/CHANGES.txt_tmpl
+++ b/pyramid/scaffolds/starter/CHANGES.txt_tmpl
diff --git a/pyramid/paster_templates/starter/MANIFEST.in_tmpl b/pyramid/scaffolds/starter/MANIFEST.in_tmpl
index 0ff6eb7a0..0ff6eb7a0 100644
--- a/pyramid/paster_templates/starter/MANIFEST.in_tmpl
+++ b/pyramid/scaffolds/starter/MANIFEST.in_tmpl
diff --git a/pyramid/paster_templates/starter/README.txt_tmpl b/pyramid/scaffolds/starter/README.txt_tmpl
index 0ddebfc3e..0ddebfc3e 100644
--- a/pyramid/paster_templates/starter/README.txt_tmpl
+++ b/pyramid/scaffolds/starter/README.txt_tmpl
diff --git a/pyramid/paster_templates/starter/development.ini_tmpl b/pyramid/scaffolds/starter/development.ini_tmpl
index 60e52da57..60e52da57 100644
--- a/pyramid/paster_templates/starter/development.ini_tmpl
+++ b/pyramid/scaffolds/starter/development.ini_tmpl
diff --git a/pyramid/paster_templates/starter/production.ini_tmpl b/pyramid/scaffolds/starter/production.ini_tmpl
index dea0ef2c6..dea0ef2c6 100644
--- a/pyramid/paster_templates/starter/production.ini_tmpl
+++ b/pyramid/scaffolds/starter/production.ini_tmpl
diff --git a/pyramid/paster_templates/starter/setup.cfg_tmpl b/pyramid/scaffolds/starter/setup.cfg_tmpl
index 04c738049..04c738049 100644
--- a/pyramid/paster_templates/starter/setup.cfg_tmpl
+++ b/pyramid/scaffolds/starter/setup.cfg_tmpl
diff --git a/pyramid/paster_templates/starter/setup.py_tmpl b/pyramid/scaffolds/starter/setup.py_tmpl
index bd2642627..bd2642627 100644
--- a/pyramid/paster_templates/starter/setup.py_tmpl
+++ b/pyramid/scaffolds/starter/setup.py_tmpl
diff --git a/template_tests.py b/pyramid/scaffolds/tests.py
index 8e70e7eb3..e36943465 100644
--- a/template_tests.py
+++ b/pyramid/scaffolds/tests.py
@@ -8,16 +8,8 @@ import tempfile
 import time
 import signal
 
-if not hasattr(subprocess, 'check_call'):
-    # 2.4
-    def check_call(*arg, **kw):
-        returncode = subprocess.call(*arg, **kw)
-        if returncode:
-            raise ValueError(returncode)
-    subprocess.check_call = check_call
-
 class TemplateTest(object):
-    def make_venv(self, directory):
+    def make_venv(self, directory): # pragma: no cover
         import virtualenv
         import sys
         from virtualenv import Logger
@@ -28,7 +20,7 @@ class TemplateTest(object):
                                       clear=False,
                                       unzip_setuptools=True,
                                       use_distribute=False)
-    def install(self, tmpl_name):
+    def install(self, tmpl_name): # pragma: no cover
         try:
             self.old_cwd = os.getcwd()
             self.directory = tempfile.mkdtemp()
@@ -67,12 +59,20 @@ class TemplateTest(object):
             shutil.rmtree(self.directory)
             os.chdir(self.old_cwd)
 
-templates = ['pyramid_starter', 'pyramid_alchemy', 'pyramid_routesalchemy',]
+if __name__ == '__main__':     # pragma: no cover
+    if not hasattr(subprocess, 'check_call'):
+        # 2.4
+        def check_call(*arg, **kw):
+            returncode = subprocess.call(*arg, **kw)
+            if returncode:
+                raise ValueError(returncode)
+        subprocess.check_call = check_call
+
+    templates = ['pyramid_starter', 'pyramid_alchemy', 'pyramid_routesalchemy',]
 
-if sys.version_info >= (2, 5):
-    templates.append('pyramid_zodb')
+    if sys.version_info >= (2, 5):
+        templates.append('pyramid_zodb')
 
-if __name__ == '__main__':
     for name in templates:
         test = TemplateTest()
         test.install(name)
diff --git a/pyramid/paster_templates/zodb/+package+/__init__.py_tmpl b/pyramid/scaffolds/zodb/+package+/__init__.py_tmpl
index 2fe3496aa..2fe3496aa 100644
--- a/pyramid/paster_templates/zodb/+package+/__init__.py_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/__init__.py_tmpl
diff --git a/pyramid/paster_templates/zodb/+package+/models.py b/pyramid/scaffolds/zodb/+package+/models.py
index 8dd0f5a49..8dd0f5a49 100644
--- a/pyramid/paster_templates/zodb/+package+/models.py
+++ b/pyramid/scaffolds/zodb/+package+/models.py
diff --git a/pyramid/paster_templates/zodb/+package+/static/favicon.ico b/pyramid/scaffolds/zodb/+package+/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/pyramid/paster_templates/zodb/+package+/static/favicon.ico
+++ b/pyramid/scaffolds/zodb/+package+/static/favicon.ico
diff --git a/pyramid/paster_templates/zodb/+package+/static/footerbg.png b/pyramid/scaffolds/zodb/+package+/static/footerbg.png
index 1fbc873da..1fbc873da 100644
--- a/pyramid/paster_templates/zodb/+package+/static/footerbg.png
+++ b/pyramid/scaffolds/zodb/+package+/static/footerbg.png
diff --git a/pyramid/paster_templates/zodb/+package+/static/headerbg.png b/pyramid/scaffolds/zodb/+package+/static/headerbg.png
index 0596f2020..0596f2020 100644
--- a/pyramid/paster_templates/zodb/+package+/static/headerbg.png
+++ b/pyramid/scaffolds/zodb/+package+/static/headerbg.png
diff --git a/pyramid/paster_templates/zodb/+package+/static/ie6.css b/pyramid/scaffolds/zodb/+package+/static/ie6.css
index b7c8493d8..b7c8493d8 100644
--- a/pyramid/paster_templates/zodb/+package+/static/ie6.css
+++ b/pyramid/scaffolds/zodb/+package+/static/ie6.css
diff --git a/pyramid/paster_templates/zodb/+package+/static/middlebg.png b/pyramid/scaffolds/zodb/+package+/static/middlebg.png
index 2369cfb7d..2369cfb7d 100644
--- a/pyramid/paster_templates/zodb/+package+/static/middlebg.png
+++ b/pyramid/scaffolds/zodb/+package+/static/middlebg.png
diff --git a/pyramid/paster_templates/zodb/+package+/static/pylons.css b/pyramid/scaffolds/zodb/+package+/static/pylons.css
index d952fb42e..d952fb42e 100644
--- a/pyramid/paster_templates/zodb/+package+/static/pylons.css
+++ b/pyramid/scaffolds/zodb/+package+/static/pylons.css
diff --git a/pyramid/paster_templates/zodb/+package+/static/pyramid-small.png b/pyramid/scaffolds/zodb/+package+/static/pyramid-small.png
index a5bc0ade7..a5bc0ade7 100644
--- a/pyramid/paster_templates/zodb/+package+/static/pyramid-small.png
+++ b/pyramid/scaffolds/zodb/+package+/static/pyramid-small.png
diff --git a/pyramid/paster_templates/zodb/+package+/static/pyramid.png b/pyramid/scaffolds/zodb/+package+/static/pyramid.png
index 347e05549..347e05549 100644
--- a/pyramid/paster_templates/zodb/+package+/static/pyramid.png
+++ b/pyramid/scaffolds/zodb/+package+/static/pyramid.png
diff --git a/pyramid/paster_templates/zodb/+package+/static/transparent.gif b/pyramid/scaffolds/zodb/+package+/static/transparent.gif
index 0341802e5..0341802e5 100644
--- a/pyramid/paster_templates/zodb/+package+/static/transparent.gif
+++ b/pyramid/scaffolds/zodb/+package+/static/transparent.gif
diff --git a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
index 4fbc554e9..4fbc554e9 100644
--- a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
diff --git a/pyramid/paster_templates/zodb/+package+/tests.py_tmpl b/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
index b0cbe33ad..b0cbe33ad 100644
--- a/pyramid/paster_templates/zodb/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
diff --git a/pyramid/paster_templates/zodb/+package+/views.py_tmpl b/pyramid/scaffolds/zodb/+package+/views.py_tmpl
index d4a1147c6..d4a1147c6 100644
--- a/pyramid/paster_templates/zodb/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/views.py_tmpl
diff --git a/pyramid/paster_templates/zodb/CHANGES.txt_tmpl b/pyramid/scaffolds/zodb/CHANGES.txt_tmpl
index 35a34f332..35a34f332 100644
--- a/pyramid/paster_templates/zodb/CHANGES.txt_tmpl
+++ b/pyramid/scaffolds/zodb/CHANGES.txt_tmpl
diff --git a/pyramid/paster_templates/zodb/MANIFEST.in_tmpl b/pyramid/scaffolds/zodb/MANIFEST.in_tmpl
index 0ff6eb7a0..0ff6eb7a0 100644
--- a/pyramid/paster_templates/zodb/MANIFEST.in_tmpl
+++ b/pyramid/scaffolds/zodb/MANIFEST.in_tmpl
diff --git a/pyramid/paster_templates/zodb/README.txt_tmpl b/pyramid/scaffolds/zodb/README.txt_tmpl
index 0ddebfc3e..0ddebfc3e 100644
--- a/pyramid/paster_templates/zodb/README.txt_tmpl
+++ b/pyramid/scaffolds/zodb/README.txt_tmpl
diff --git a/pyramid/paster_templates/zodb/development.ini_tmpl b/pyramid/scaffolds/zodb/development.ini_tmpl
index ae9584690..ae9584690 100644
--- a/pyramid/paster_templates/zodb/development.ini_tmpl
+++ b/pyramid/scaffolds/zodb/development.ini_tmpl
diff --git a/pyramid/paster_templates/zodb/production.ini_tmpl b/pyramid/scaffolds/zodb/production.ini_tmpl
index ff52a0585..ff52a0585 100644
--- a/pyramid/paster_templates/zodb/production.ini_tmpl
+++ b/pyramid/scaffolds/zodb/production.ini_tmpl
diff --git a/pyramid/paster_templates/zodb/setup.cfg_tmpl b/pyramid/scaffolds/zodb/setup.cfg_tmpl
index 5bec29823..5bec29823 100644
--- a/pyramid/paster_templates/zodb/setup.cfg_tmpl
+++ b/pyramid/scaffolds/zodb/setup.cfg_tmpl
diff --git a/pyramid/paster_templates/zodb/setup.py_tmpl b/pyramid/scaffolds/zodb/setup.py_tmpl
index 46759b514..46759b514 100644
--- a/pyramid/paster_templates/zodb/setup.py_tmpl
+++ b/pyramid/scaffolds/zodb/setup.py_tmpl
diff --git a/pyramid/tests/test_paster.py b/pyramid/tests/test_paster.py
index 89b023852..cf0b38a80 100644
--- a/pyramid/tests/test_paster.py
+++ b/pyramid/tests/test_paster.py
@@ -1,39 +1,5 @@
 import unittest
 
-class TestPyramidTemplate(unittest.TestCase):
-    def _getTargetClass(self):
-        from pyramid.paster import PyramidTemplate
-        return PyramidTemplate
-
-    def _makeOne(self, name):
-        cls = self._getTargetClass()
-        return cls(name)
-
-    def test_pre_logger_eq_root(self):
-        tmpl = self._makeOne('name')
-        vars = {'package':'root'}
-        result = tmpl.pre(None, None, vars)
-        self.assertEqual(result, None)
-        self.assertEqual(vars['package_logger'], 'app')
-        self.assertTrue(len(vars['random_string']) == 40)
-
-    def test_pre_logger_noteq_root(self):
-        tmpl = self._makeOne('name')
-        vars = {'package':'notroot'}
-        result = tmpl.pre(None, None, vars)
-        self.assertEqual(result, None)
-        self.assertEqual(vars['package_logger'], 'notroot')
-        self.assertTrue(len(vars['random_string']) == 40)
-
-    def test_post(self):
-        tmpl = self._makeOne('name')
-        vars = {'package':'root'}
-        L = []
-        tmpl.out = lambda msg: L.append(msg)
-        result = tmpl.post(None, None, vars)
-        self.assertEqual(result, None)
-        self.assertEqual(L, ['Welcome to Pyramid.  Sorry for the convenience.'])
-
 class TestPShellCommand(unittest.TestCase):
     def _getTargetClass(self):
         from pyramid.paster import PShellCommand
diff --git a/pyramid/tests/test_scaffolds.py b/pyramid/tests/test_scaffolds.py
new file mode 100644
index 000000000..ed2c5a993
--- /dev/null
+++ b/pyramid/tests/test_scaffolds.py
@@ -0,0 +1,36 @@
+import unittest
+
+class TestPyramidTemplate(unittest.TestCase):
+    def _getTargetClass(self):
+        from pyramid.scaffolds import PyramidTemplate
+        return PyramidTemplate
+
+    def _makeOne(self, name):
+        cls = self._getTargetClass()
+        return cls(name)
+
+    def test_pre_logger_eq_root(self):
+        tmpl = self._makeOne('name')
+        vars = {'package':'root'}
+        result = tmpl.pre(None, None, vars)
+        self.assertEqual(result, None)
+        self.assertEqual(vars['package_logger'], 'app')
+        self.assertTrue(len(vars['random_string']) == 40)
+
+    def test_pre_logger_noteq_root(self):
+        tmpl = self._makeOne('name')
+        vars = {'package':'notroot'}
+        result = tmpl.pre(None, None, vars)
+        self.assertEqual(result, None)
+        self.assertEqual(vars['package_logger'], 'notroot')
+        self.assertTrue(len(vars['random_string']) == 40)
+
+    def test_post(self):
+        tmpl = self._makeOne('name')
+        vars = {'package':'root'}
+        L = []
+        tmpl.out = lambda msg: L.append(msg)
+        result = tmpl.post(None, None, vars)
+        self.assertEqual(result, None)
+        self.assertEqual(L, ['Welcome to Pyramid.  Sorry for the convenience.'])
+
diff --git a/setup.py b/setup.py
index f965353ed..6f3fb4eea 100644
--- a/setup.py
+++ b/setup.py
@@ -78,10 +78,10 @@ setup(name='pyramid',
       test_suite="pyramid.tests",
       entry_points = """\
         [paste.paster_create_template]
-        pyramid_starter=pyramid.paster:StarterProjectTemplate
-        pyramid_zodb=pyramid.paster:ZODBProjectTemplate
-        pyramid_routesalchemy=pyramid.paster:RoutesAlchemyProjectTemplate
-        pyramid_alchemy=pyramid.paster:AlchemyProjectTemplate
+        pyramid_starter=pyramid.scaffolds:StarterProjectTemplate
+        pyramid_zodb=pyramid.scaffolds:ZODBProjectTemplate
+        pyramid_routesalchemy=pyramid.scaffolds:RoutesAlchemyProjectTemplate
+        pyramid_alchemy=pyramid.scaffolds:AlchemyProjectTemplate
         [paste.paster_command]
         pshell=pyramid.paster:PShellCommand
         proutes=pyramid.paster:PRoutesCommand