update prequest, proutes, ptweens and pviews

Also ensure that each script is invoking setup_logging.

9 files changed, 93 insertions, 125 deletions

diff --git a/pyramid/scripts/prequest.py b/pyramid/scripts/prequest.py
index 66feff624..f0681afd7 100644
--- a/pyramid/scripts/prequest.py
+++ b/pyramid/scripts/prequest.py
@@ -5,9 +5,8 @@ import textwrap
 
 from pyramid.compat import url_unquote
 from pyramid.request import Request
-from pyramid.paster import get_app
+from pyramid.scripts.common import get_config_loader
 from pyramid.scripts.common import parse_vars
-from pyramid.scripts.common import setup_logging
 
 def main(argv=sys.argv, quiet=False):
     command = PRequestCommand(argv, quiet)
@@ -110,7 +109,7 @@ class PRequestCommand(object):
              "passed here.",
         )
 
-    get_app = staticmethod(get_app)
+    _get_config_loader = staticmethod(get_config_loader)
     stdin = sys.stdin
 
     def __init__(self, argv, quiet=False):
@@ -121,17 +120,18 @@ class PRequestCommand(object):
         if not self.quiet:
             print(msg)
 
-    def configure_logging(self, app_spec):
-        setup_logging(app_spec)
-
     def run(self):
         if not self.args.config_uri or not self.args.path_info:
             self.out('You must provide at least two arguments')
             return 2
-        app_spec = self.args.config_uri
+        config_uri = self.args.config_uri
+        config_vars = parse_vars(self.args.config_vars)
         path = self.args.path_info
 
-        self.configure_logging(app_spec)
+        loader = self._get_config_loader(config_uri)
+        loader.setup_logging(config_vars)
+
+        app = loader.get_wsgi_app(self.args.app_name, config_vars)
 
         if not path.startswith('/'):
             path = '/' + path
@@ -158,9 +158,6 @@ class PRequestCommand(object):
                 name, value = item.split(':', 1)
                 headers[name] = value.strip()
 
-        app = self.get_app(app_spec, self.args.app_name,
-                options=parse_vars(self.args.config_vars))
-
         request_method = (self.args.method or 'GET').upper()
 
         environ = {
diff --git a/pyramid/scripts/proutes.py b/pyramid/scripts/proutes.py
index 80c8238a2..69d61ae8f 100644
--- a/pyramid/scripts/proutes.py
+++ b/pyramid/scripts/proutes.py
@@ -7,10 +7,11 @@ import re
 from zope.interface import Interface
 
 from pyramid.paster import bootstrap
-from pyramid.compat import (string_types, configparser)
+from pyramid.compat import string_types
 from pyramid.interfaces import IRouteRequest
 from pyramid.config import not_
 
+from pyramid.scripts.common import get_config_loader
 from pyramid.scripts.common import parse_vars
 from pyramid.static import static_view
 from pyramid.view import _find_views
@@ -175,7 +176,6 @@ def get_route_data(route, registry):
                 (route.name, route_intr['external_url'], UNKNOWN_KEY, ANY_KEY)
             ]
 
-
         route_request_methods = route_intr['request_methods']
         view_intr = registry.introspector.related(route_intr)
 
@@ -245,9 +245,9 @@ class PRoutesCommand(object):
     will be assumed.  Example: 'proutes myapp.ini'.
 
     """
-    bootstrap = (bootstrap,)
+    bootstrap = staticmethod(bootstrap)  # testing
+    get_config_loader = staticmethod(get_config_loader)  # testing
     stdout = sys.stdout
-    ConfigParser = configparser.ConfigParser  # testing
     parser = argparse.ArgumentParser(
         description=textwrap.dedent(description),
         formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -308,18 +308,12 @@ class PRoutesCommand(object):
 
         return True
 
-    def proutes_file_config(self, filename):
-        config = self.ConfigParser()
-        config.read(filename)
-        try:
-            items = config.items('proutes')
-            for k, v in items:
-                if 'format' == k:
-                    cols = re.split(r'[,|\s\n]+', v)
-                    self.column_format = [x.strip() for x in cols]
-
-        except configparser.NoSectionError:
-            return
+    def proutes_file_config(self, loader, global_conf=None):
+        settings = loader.get_settings('proutes', global_conf)
+        format = settings.get('format')
+        if format:
+            cols = re.split(r'[,|\s\n]+', format)
+            self.column_format = [x.strip() for x in cols]
 
     def out(self, msg):  # pragma: no cover
         if not self.quiet:
@@ -336,12 +330,15 @@ class PRoutesCommand(object):
             return 2
 
         config_uri = self.args.config_uri
-        env = self.bootstrap[0](config_uri, options=parse_vars(self.args.config_vars))
+        config_vars = parse_vars(self.args.config_vars)
+        loader = self.get_config_loader(config_uri)
+        loader.setup_logging(config_vars)
+        self.proutes_file_config(loader, config_vars)
+
+        env = self.bootstrap(config_uri, options=config_vars)
         registry = env['registry']
         mapper = self._get_mapper(registry)
 
-        self.proutes_file_config(config_uri)
-
         if self.args.format:
             columns = self.args.format.split(',')
             self.column_format = [x.strip() for x in columns]
diff --git a/pyramid/scripts/ptweens.py b/pyramid/scripts/ptweens.py
index 5ca77e52a..d5cbebe12 100644
--- a/pyramid/scripts/ptweens.py
+++ b/pyramid/scripts/ptweens.py
@@ -7,6 +7,7 @@ from pyramid.interfaces import ITweens
 from pyramid.tweens import MAIN
 from pyramid.tweens import INGRESS
 from pyramid.paster import bootstrap
+from pyramid.paster import setup_logging
 from pyramid.scripts.common import parse_vars
 
 def main(argv=sys.argv, quiet=False):
@@ -47,7 +48,8 @@ class PTweensCommand(object):
         )
 
     stdout = sys.stdout
-    bootstrap = (bootstrap,) # testing
+    bootstrap = staticmethod(bootstrap) # testing
+    setup_logging = staticmethod(setup_logging) # testing
 
     def __init__(self, argv, quiet=False):
         self.quiet = quiet
@@ -76,7 +78,9 @@ class PTweensCommand(object):
             self.out('Requires a config file argument')
             return 2
         config_uri = self.args.config_uri
-        env = self.bootstrap[0](config_uri, options=parse_vars(self.args.config_vars))
+        config_vars = parse_vars(self.args.config_vars)
+        self.setup_logging(config_uri, global_conf=config_vars)
+        env = self.bootstrap(config_uri, options=config_vars)
         registry = env['registry']
         tweens = self._get_tweens(registry)
         if tweens is not None:
diff --git a/pyramid/scripts/pviews.py b/pyramid/scripts/pviews.py
index 4d3312917..c0df2f078 100644
--- a/pyramid/scripts/pviews.py
+++ b/pyramid/scripts/pviews.py
@@ -4,6 +4,7 @@ import textwrap
 
 from pyramid.interfaces import IMultiView
 from pyramid.paster import bootstrap
+from pyramid.paster import setup_logging
 from pyramid.request import Request
 from pyramid.scripts.common import parse_vars
 from pyramid.view import _find_views
@@ -51,7 +52,8 @@ class PViewsCommand(object):
         )
 
 
-    bootstrap = (bootstrap,) # testing
+    bootstrap = staticmethod(bootstrap) # testing
+    setup_logging = staticmethod(setup_logging) # testing
 
     def __init__(self, argv, quiet=False):
         self.quiet = quiet
@@ -252,13 +254,15 @@ class PViewsCommand(object):
             self.out('Command requires a config file arg and a url arg')
             return 2
         config_uri = self.args.config_uri
+        config_vars = parse_vars(self.args.config_vars)
         url = self.args.url
 
+        self.setup_logging(config_uri, global_conf=config_vars)
+
         if not url.startswith('/'):
             url = '/%s' % url
         request = Request.blank(url)
-        env = self.bootstrap[0](config_uri, options=parse_vars(self.args.config_vars),
-                                request=request)
+        env = self.bootstrap(config_uri, options=config_vars, request=request)
         view = self._find_view(request)
         self.out('')
         self.out("URL = %s" % url)
diff --git a/pyramid/tests/test_scripts/dummy.py b/pyramid/tests/test_scripts/dummy.py
index b904adfbd..18810f8f3 100644
--- a/pyramid/tests/test_scripts/dummy.py
+++ b/pyramid/tests/test_scripts/dummy.py
@@ -167,7 +167,7 @@ class DummyPkgResources(object):
 class dummy_setup_logging(object):
     def __call__(self, config_uri, global_conf):
         self.config_uri = config_uri
-        self.global_conf = global_conf
+        self.defaults = global_conf
 
 
 class DummyLoader(object):
@@ -190,7 +190,7 @@ class DummyLoader(object):
 
     def get_settings(self, name=None, defaults=None):
         self.add_call('settings', name, defaults)
-        return self.result
+        return self.settings.get(name, {})
 
     def get_wsgi_app(self, name=None, defaults=None):
         self.add_call('app', name, defaults)
diff --git a/pyramid/tests/test_scripts/test_prequest.py b/pyramid/tests/test_scripts/test_prequest.py
index 45db0dbaf..ec5119270 100644
--- a/pyramid/tests/test_scripts/test_prequest.py
+++ b/pyramid/tests/test_scripts/test_prequest.py
@@ -1,4 +1,5 @@
 import unittest
+from pyramid.tests.test_scripts import dummy
 
 class TestPRequestCommand(unittest.TestCase):
     def _getTargetClass(self):
@@ -7,23 +8,17 @@ class TestPRequestCommand(unittest.TestCase):
 
     def _makeOne(self, argv, headers=None):
         cmd = self._getTargetClass()(argv)
-        cmd.get_app = self.get_app
-        self._headers = headers or []
-        self._out = []
-        cmd.out = self.out
-        return cmd
-
-    def get_app(self, spec, app_name=None, options=None):
-        self._spec = spec
-        self._app_name = app_name
-        self._options = options or {}
 
         def helloworld(environ, start_request):
             self._environ = environ
             self._path_info = environ['PATH_INFO']
-            start_request('200 OK', self._headers)
+            start_request('200 OK', headers or [])
             return [b'abc']
-        return helloworld
+        self.loader = dummy.DummyLoader(app=helloworld)
+        self._out = []
+        cmd._get_config_loader = self.loader
+        cmd.out = self.out
+        return cmd
 
     def out(self, msg):
         self._out.append(msg)
@@ -38,8 +33,10 @@ class TestPRequestCommand(unittest.TestCase):
                 [('Content-Type', 'text/html; charset=UTF-8')])
         command.run()
         self.assertEqual(self._path_info, '/')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
+        self.assertEqual(self.loader.uri, 'development.ini')
+        self.assertEqual(self.loader.calls[0]['op'], 'logging')
+        self.assertEqual(self.loader.calls[1]['op'], 'app')
+        self.assertEqual(self.loader.calls[1]['name'], None)
         self.assertEqual(self._out, ['abc'])
 
     def test_command_path_doesnt_start_with_slash(self):
@@ -47,8 +44,7 @@ class TestPRequestCommand(unittest.TestCase):
                 [('Content-Type', 'text/html; charset=UTF-8')])
         command.run()
         self.assertEqual(self._path_info, '/abc')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
+        self.assertEqual(self.loader.uri, 'development.ini')
         self.assertEqual(self._out, ['abc'])
 
     def test_command_has_bad_config_header(self):
@@ -67,8 +63,6 @@ class TestPRequestCommand(unittest.TestCase):
         command.run()
         self.assertEqual(self._environ['HTTP_NAME'], 'value')
         self.assertEqual(self._path_info, '/')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
         self.assertEqual(self._out, ['abc'])
 
     def test_command_w_basic_auth(self):
@@ -81,8 +75,6 @@ class TestPRequestCommand(unittest.TestCase):
         self.assertEqual(self._environ['HTTP_AUTHORIZATION'],
                         'Basic dXNlcjpwYXNzd29yZA==')
         self.assertEqual(self._path_info, '/')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
         self.assertEqual(self._out, ['abc'])
 
     def test_command_has_content_type_header_var(self):
@@ -92,8 +84,6 @@ class TestPRequestCommand(unittest.TestCase):
         command.run()
         self.assertEqual(self._environ['CONTENT_TYPE'], 'app/foo')
         self.assertEqual(self._path_info, '/')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
         self.assertEqual(self._out, ['abc'])
 
     def test_command_has_multiple_header_vars(self):
@@ -109,8 +99,6 @@ class TestPRequestCommand(unittest.TestCase):
         self.assertEqual(self._environ['HTTP_NAME'], 'value')
         self.assertEqual(self._environ['HTTP_NAME2'], 'value2')
         self.assertEqual(self._path_info, '/')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
         self.assertEqual(self._out, ['abc'])
 
     def test_command_method_get(self):
@@ -119,8 +107,6 @@ class TestPRequestCommand(unittest.TestCase):
         command.run()
         self.assertEqual(self._environ['REQUEST_METHOD'], 'GET')
         self.assertEqual(self._path_info, '/')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
         self.assertEqual(self._out, ['abc'])
 
     def test_command_method_post(self):
@@ -134,8 +120,6 @@ class TestPRequestCommand(unittest.TestCase):
         self.assertEqual(self._environ['CONTENT_LENGTH'], '-1')
         self.assertEqual(self._environ['wsgi.input'], stdin)
         self.assertEqual(self._path_info, '/')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
         self.assertEqual(self._out, ['abc'])
 
     def test_command_method_put(self):
@@ -149,8 +133,6 @@ class TestPRequestCommand(unittest.TestCase):
         self.assertEqual(self._environ['CONTENT_LENGTH'], '-1')
         self.assertEqual(self._environ['wsgi.input'], stdin)
         self.assertEqual(self._path_info, '/')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
         self.assertEqual(self._out, ['abc'])
 
     def test_command_method_patch(self):
@@ -164,8 +146,6 @@ class TestPRequestCommand(unittest.TestCase):
         self.assertEqual(self._environ['CONTENT_LENGTH'], '-1')
         self.assertEqual(self._environ['wsgi.input'], stdin)
         self.assertEqual(self._path_info, '/')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
         self.assertEqual(self._out, ['abc'])
 
     def test_command_method_propfind(self):
@@ -178,8 +158,6 @@ class TestPRequestCommand(unittest.TestCase):
         command.run()
         self.assertEqual(self._environ['REQUEST_METHOD'], 'PROPFIND')
         self.assertEqual(self._path_info, '/')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
         self.assertEqual(self._out, ['abc'])
 
     def test_command_method_options(self):
@@ -192,8 +170,6 @@ class TestPRequestCommand(unittest.TestCase):
         command.run()
         self.assertEqual(self._environ['REQUEST_METHOD'], 'OPTIONS')
         self.assertEqual(self._path_info, '/')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
         self.assertEqual(self._out, ['abc'])
 
     def test_command_with_query_string(self):
@@ -202,8 +178,6 @@ class TestPRequestCommand(unittest.TestCase):
         command.run()
         self.assertEqual(self._environ['QUERY_STRING'], 'a=1&b=2&c')
         self.assertEqual(self._path_info, '/abc')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
         self.assertEqual(self._out, ['abc'])
 
     def test_command_display_headers(self):
@@ -212,8 +186,6 @@ class TestPRequestCommand(unittest.TestCase):
             [('Content-Type', 'text/html; charset=UTF-8')])
         command.run()
         self.assertEqual(self._path_info, '/')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
         self.assertEqual(
             self._out,
             ['200 OK', 'Content-Type: text/html; charset=UTF-8', 'abc'])
@@ -223,21 +195,13 @@ class TestPRequestCommand(unittest.TestCase):
                                 headers=[('Content-Type', 'image/jpeg')])
         command.run()
         self.assertEqual(self._path_info, '/')
-        self.assertEqual(self._spec, 'development.ini')
-        self.assertEqual(self._app_name, None)
 
         self.assertEqual(self._out, [b'abc'])
 
     def test_command_method_configures_logging(self):
         command = self._makeOne(['', 'development.ini', '/'])
-        called_args = []
-
-        def configure_logging(app_spec):
-            called_args.append(app_spec)
-
-        command.configure_logging = configure_logging
         command.run()
-        self.assertEqual(called_args, ['development.ini'])
+        self.assertEqual(self.loader.calls[0]['op'], 'logging')
 
 
 class Test_main(unittest.TestCase):
diff --git a/pyramid/tests/test_scripts/test_proutes.py b/pyramid/tests/test_scripts/test_proutes.py
index 74293a112..fab5e163e 100644
--- a/pyramid/tests/test_scripts/test_proutes.py
+++ b/pyramid/tests/test_scripts/test_proutes.py
@@ -19,7 +19,8 @@ class TestPRoutesCommand(unittest.TestCase):
 
     def _makeOne(self):
         cmd = self._getTargetClass()([])
-        cmd.bootstrap = (dummy.DummyBootstrap(),)
+        cmd.bootstrap = dummy.DummyBootstrap()
+        cmd.get_config_loader = dummy.DummyLoader()
         cmd.args.config_uri = '/foo/bar/myapp.ini#myapp'
 
         return cmd
@@ -37,14 +38,15 @@ class TestPRoutesCommand(unittest.TestCase):
 
     def test_good_args(self):
         cmd = self._getTargetClass()([])
-        cmd.bootstrap = (dummy.DummyBootstrap(),)
+        cmd.bootstrap = dummy.DummyBootstrap()
+        cmd.get_config_loader = dummy.DummyLoader()
         cmd.args.config_uri = '/foo/bar/myapp.ini#myapp'
         cmd.args.config_args = ('a=1',)
         route = dummy.DummyRoute('a', '/a')
         mapper = dummy.DummyMapper(route)
         cmd._get_mapper = lambda *arg: mapper
         registry = self._makeRegistry()
-        cmd.bootstrap = (dummy.DummyBootstrap(registry=registry),)
+        cmd.bootstrap = dummy.DummyBootstrap(registry=registry)
         L = []
         cmd.out = lambda msg: L.append(msg)
         cmd.run()
@@ -52,7 +54,8 @@ class TestPRoutesCommand(unittest.TestCase):
 
     def test_bad_args(self):
         cmd = self._getTargetClass()([])
-        cmd.bootstrap = (dummy.DummyBootstrap(),)
+        cmd.bootstrap = dummy.DummyBootstrap()
+        cmd.get_config_loader = dummy.DummyLoader()
         cmd.args.config_uri = '/foo/bar/myapp.ini#myapp'
         cmd.args.config_vars = ('a',)
         route = dummy.DummyRoute('a', '/a')
@@ -86,7 +89,7 @@ class TestPRoutesCommand(unittest.TestCase):
         mapper = dummy.DummyMapper(route)
         command._get_mapper = lambda *arg: mapper
         registry = self._makeRegistry()
-        command.bootstrap = (dummy.DummyBootstrap(registry=registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=registry)
 
         L = []
         command.out = L.append
@@ -103,7 +106,7 @@ class TestPRoutesCommand(unittest.TestCase):
         L = []
         command.out = L.append
         registry = self._makeRegistry()
-        command.bootstrap = (dummy.DummyBootstrap(registry=registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -124,7 +127,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command._get_mapper = lambda *arg: mapper
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -150,7 +153,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command._get_mapper = lambda *arg: mapper
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -190,7 +193,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command._get_mapper = lambda *arg: mapper
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -218,7 +221,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command = self._makeOne()
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -252,7 +255,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command._get_mapper = lambda *arg: mapper
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -288,7 +291,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command._get_mapper = lambda *arg: mapper
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -327,7 +330,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command = self._makeOne()
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -354,7 +357,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command = self._makeOne()
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -382,7 +385,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command = self._makeOne()
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -410,7 +413,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command = self._makeOne()
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -436,7 +439,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command = self._makeOne()
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 5)
@@ -461,7 +464,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command = self._makeOne()
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -491,7 +494,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command = self._makeOne()
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config2.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config2.registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -521,7 +524,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command = self._makeOne()
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -551,7 +554,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command = self._makeOne()
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -592,7 +595,7 @@ class TestPRoutesCommand(unittest.TestCase):
 
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -624,7 +627,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command.args.format = 'method,name'
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
@@ -654,7 +657,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command.args.format = 'predicates,name,pattern'
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
         expected = (
             "You provided invalid formats ['predicates'], "
             "Available formats are ['name', 'pattern', 'view', 'method']"
@@ -682,10 +685,9 @@ class TestPRoutesCommand(unittest.TestCase):
 
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
-        config_factory = dummy.DummyConfigParserFactory()
-        command.ConfigParser = config_factory
-        config_factory.items = [('format', 'method\nname')]
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
+        command.get_config_loader = dummy.DummyLoader(
+            {'proutes': {'format': 'method\nname'}})
 
         result = command.run()
         self.assertEqual(result, 0)
@@ -715,10 +717,9 @@ class TestPRoutesCommand(unittest.TestCase):
 
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
-        config_factory = dummy.DummyConfigParserFactory()
-        command.ConfigParser = config_factory
-        config_factory.items = [('format', 'method name')]
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
+        command.get_config_loader = dummy.DummyLoader(
+            {'proutes': {'format': 'method name'}})
 
         result = command.run()
         self.assertEqual(result, 0)
@@ -748,10 +749,9 @@ class TestPRoutesCommand(unittest.TestCase):
 
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
-        config_factory = dummy.DummyConfigParserFactory()
-        command.ConfigParser = config_factory
-        config_factory.items = [('format', 'method,name')]
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
+        command.get_config_loader = dummy.DummyLoader(
+            {'proutes': {'format': 'method,name'}})
 
         result = command.run()
         self.assertEqual(result, 0)
@@ -771,7 +771,7 @@ class TestPRoutesCommand(unittest.TestCase):
         command = self._makeOne()
         L = []
         command.out = L.append
-        command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
+        command.bootstrap = dummy.DummyBootstrap(registry=config.registry)
         result = command.run()
         self.assertEqual(result, 0)
         self.assertEqual(len(L), 3)
diff --git a/pyramid/tests/test_scripts/test_ptweens.py b/pyramid/tests/test_scripts/test_ptweens.py
index f63069fed..6907b858d 100644
--- a/pyramid/tests/test_scripts/test_ptweens.py
+++ b/pyramid/tests/test_scripts/test_ptweens.py
@@ -8,7 +8,8 @@ class TestPTweensCommand(unittest.TestCase):
 
     def _makeOne(self):
         cmd = self._getTargetClass()([])
-        cmd.bootstrap = (dummy.DummyBootstrap(),)
+        cmd.bootstrap = dummy.DummyBootstrap()
+        cmd.setup_logging = dummy.dummy_setup_logging()
         cmd.args.config_uri = '/foo/bar/myapp.ini#myapp'
         return cmd
 
diff --git a/pyramid/tests/test_scripts/test_pviews.py b/pyramid/tests/test_scripts/test_pviews.py
index 7bdab5804..6ec9defbd 100644
--- a/pyramid/tests/test_scripts/test_pviews.py
+++ b/pyramid/tests/test_scripts/test_pviews.py
@@ -8,7 +8,8 @@ class TestPViewsCommand(unittest.TestCase):
 
     def _makeOne(self, registry=None):
         cmd = self._getTargetClass()([])
-        cmd.bootstrap = (dummy.DummyBootstrap(registry=registry),)
+        cmd.bootstrap = dummy.DummyBootstrap(registry=registry)
+        cmd.setup_logging = dummy.dummy_setup_logging()
         cmd.args.config_uri = '/foo/bar/myapp.ini#myapp'
         return cmd