get scaffold functests to pass

5 files changed, 8 insertions, 3 deletions

diff --git a/pyramid/scaffolds/copydir.py b/pyramid/scaffolds/copydir.py
index a3bd2821d..e0badb26e 100644
--- a/pyramid/scaffolds/copydir.py
+++ b/pyramid/scaffolds/copydir.py
@@ -50,6 +50,7 @@ def copy_dir(source, dest, vars, verbosity, simulate, indent=0,
     """
     def out(msg):
         out_.write(msg)
+        out_.write('\n')
         out_.flush()
     # This allows you to use a leading +dot+ in filenames which would
     # otherwise be skipped because leading dots make the file hidden:
@@ -172,6 +173,7 @@ def query_interactive(src_fn, dest_fn, src_content, dest_content,
                       simulate, out_=sys.stdout):
     def out(msg):
         out_.write(msg)
+        out_.write('\n')
         out_.flush()
     global all_answer
     from difflib import unified_diff, context_diff
diff --git a/pyramid/scaffolds/tests.py b/pyramid/scaffolds/tests.py
index c0b60b61b..3c276a473 100644
--- a/pyramid/scaffolds/tests.py
+++ b/pyramid/scaffolds/tests.py
@@ -30,6 +30,9 @@ class TemplateTest(object):
             self.directory = tempfile.mkdtemp()
             self.make_venv(self.directory)
             os.chdir(pkg_resources.get_distribution('pyramid').location)
+            subprocess.check_call( # XXX remove later
+                [os.path.join(self.directory, 'bin', 'easy_install'),
+                 'https://github.com/Pylons/webob/zipball/master'])
             subprocess.check_call(
                 [os.path.join(self.directory, 'bin', 'python'),
                  'setup.py', 'develop'])
diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py
index 5c8d3120e..47a709af4 100644
--- a/pyramid/scripts/pcreate.py
+++ b/pyramid/scripts/pcreate.py
@@ -12,7 +12,7 @@ _bad_chars_re = re.compile('[^a-zA-Z0-9_]')
 
 def main(argv=sys.argv, quiet=False):
     command = PCreateCommand(argv, quiet)
-    return command.run()
+    command.run()
 
 class PCreateCommand(object):
     verbosity = 1
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index fdadf5175..8adcf4135 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -28,7 +28,7 @@ MAXFD = 1024
 
 def main(argv=sys.argv, quiet=False):
     command = PServeCommand(argv, quiet=quiet)
-    return command.run()
+    command.run()
 
 class DaemonizeException(Exception):
     pass
diff --git a/pyramid/scripts/pshell.py b/pyramid/scripts/pshell.py
index 40673906b..0bc5c34b4 100644
--- a/pyramid/scripts/pshell.py
+++ b/pyramid/scripts/pshell.py
@@ -10,7 +10,7 @@ from pyramid.scripts.common import logging_file_config
 
 def main(argv=sys.argv, quiet=False):
     command = PShellCommand(argv, quiet)
-    return command.run()
+    command.run()
 
 class PShellCommand(object):
     """Open an interactive shell with a :app:`Pyramid` app loaded.