merge

.gitignore

+.installed.cfg
+bin/
+build/
+develop-eggs/
+eggs/
+parts/
+*.pyc
+*.egg
+*.egg-info
\ No newline at end of file

MANIFEST.in

 include *.txt
 recursive-include src *.txt
-exclude MANIFEST.in buildout.cfg .bzrignore
+exclude MANIFEST.in buildout.cfg .bzrignore .gitignore

src/zc/buildout/buildout.py

@@ -976,10 +976,10 @@ class Buildout(UserDict.DictMixin):
             )
 
         # Restart
-        args = map(zc.buildout.easy_install._safe_arg, sys.argv)
+        args = list(sys.argv)
         if not __debug__:
             args.insert(0, '-O')
-        args.insert(0, zc.buildout.easy_install._safe_arg(sys.executable))
+        args.insert(0, sys.executable)
         # We want to make sure that our new site.py is used for rerunning
         # buildout, so we put the partsdir in PYTHONPATH for our restart.
         # This overrides any set PYTHONPATH, but since we generally are
@@ -987,6 +987,8 @@ class Buildout(UserDict.DictMixin):
         # library) then that should be fine.
         env = os.environ.copy()
         env['PYTHONPATH'] = partsdir
+        # windows: Popen will quote args itself if needed
+        # see subprocess.list2cmdline
         sys.exit(subprocess.Popen(args, env=env).wait())
 
     def _load_extensions(self):

src/zc/buildout/testing.py

@@ -151,8 +151,7 @@ def _runsetup(setup, executable, *args):
         setup = os.path.join(setup, 'setup.py')
     d = os.path.dirname(setup)
 
-    args = [zc.buildout.easy_install._safe_arg(arg)
-            for arg in args]
+    args = list(args)
     args.insert(0, '-q')
     env = dict(os.environ)
     if executable == sys.executable:
@@ -163,9 +162,9 @@ def _runsetup(setup, executable, *args):
     try:
         os.chdir(d)
         p = subprocess.Popen(
-            [zc.buildout.easy_install._safe_arg(executable), setup] + args,
+            [executable, setup] + args,
             stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
-            close_fds=True, env=env)
+            close_fds=MUST_CLOSE_FDS, env=env)
         out = p.stdout.read()
         if p.wait():
             print out