Trimming down the paste_deploy template

4 files changed, 11 insertions, 22 deletions

diff --git a/paste/deploy/loadwsgi.py b/paste/deploy/loadwsgi.py
index 2513a95..608103c 100644
--- a/paste/deploy/loadwsgi.py
+++ b/paste/deploy/loadwsgi.py
@@ -525,6 +525,7 @@ class EggLoader(_Loader):
         possible = []
         for protocol_options in object_type.egg_protocols:
             for protocol in protocol_options:
+                pkg_resources.require(self.spec)
                 entry = pkg_resources.get_entry_info(
                     self.spec,
                     protocol,
diff --git a/paste/deploy/paster_templates/paste_deploy/docs/config.txt b/paste/deploy/paster_templates/paste_deploy/docs/config.txt
deleted file mode 100644
index cf6543d..0000000
--- a/paste/deploy/paster_templates/paste_deploy/docs/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Description of all the configuration parameters
diff --git a/paste/deploy/paster_templates/paste_deploy/docs/devel_config.ini_tmpl b/paste/deploy/paster_templates/paste_deploy/docs/devel_config.ini_tmpl
index ff550e3..ecb241d 100644
--- a/paste/deploy/paster_templates/paste_deploy/docs/devel_config.ini_tmpl
+++ b/paste/deploy/paster_templates/paste_deploy/docs/devel_config.ini_tmpl
@@ -1,25 +1,17 @@
-[DEFAULT]
-client_name = test_client
-error_email = ${author_email|empty}
-config_root = <docs>
+[filter-app:main]
+# This puts the interactive debugger in place:
+use = egg:Paste#evalerror
+next = devel
 
-[app:main]
-use = egg:PasteWebKit
-app_name = ${package}
-package_name = ${package}
-# @@: This should be moved into a SQLObject template:
-database = postgres://pgsql@/${package}
+[app:devel]
+# This application is meant for interactive development
+use = egg:${project}
 debug = true
-get client_name = client_name
-get email_errors = email_errors
 
 [app:test]
-use = main
-# Disable emailing of errors:
-email_errors =
-
-# @@: This should be moved into a SQLObject template:
-database = postgres://pgsql@/${package}_test
+# While this version of the configuration is for non-iteractive
+# tests (unit tests)
+use = devel
 
 [server:main]
 use = egg:PasteScript#wsgiutils
diff --git a/paste/deploy/paster_templates/paste_deploy/docs/example_deploy.ini_tmpl b/paste/deploy/paster_templates/paste_deploy/docs/example_deploy.ini_tmpl
deleted file mode 100644
index b497a40..0000000
--- a/paste/deploy/paster_templates/paste_deploy/docs/example_deploy.ini_tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-[config:live]
-#database = postgres://pgsql@/${package}
-