Fixes in response to pull-request comments

bootstrap/bootstrap.py

@@ -57,7 +57,7 @@ options, args = parser.parse_args()
 # handle -S
 
 def normpath(p):
-    return p[:-1] if p.endswith('/') else p
+    return p[:-1] if p.endswith(os.path.sep) else p
 
 nosite = 'site' not in sys.modules
 if nosite:
@@ -153,8 +153,6 @@ if version:
     requirement = '=='.join((requirement, version))
 cmd.append(requirement)
 
-print 'requirement', requirement
-
 import subprocess
 if subprocess.call(cmd, env=env) != 0:
     raise Exception(

dev.py

@@ -30,7 +30,7 @@ if os.path.isdir('build'):
 # handle -S
 
 def normpath(p):
-    return p[:-1] if p.endswith('/') else p
+    return p[:-1] if p.endswith(os.path.sep) else p
 
 nosite = 'site' not in sys.modules
 if nosite:

src/zc/buildout/easy_install.py

@@ -18,13 +18,15 @@ It doesn't install scripts.  It uses distribute and requires it to be
 installed.
 """
 
+import os
 import sys
 
 ######################################################################
 # handle -S
 
 def normpath(p):
-    return p[:-1] if p.endswith('/') else p
+    return p[:-1] if p.endswith(os.path.sep) else p
+
 no_site = 'site' not in sys.modules
 if no_site:
     initial_paths = set(map(normpath, sys.path))
@@ -36,7 +38,6 @@ if no_site:
 import distutils.errors
 import glob
 import logging
-import os
 import pkg_resources
 import py_compile
 import re
@@ -1014,7 +1015,7 @@ def _script(module_name, attrs, path, dest, arguments, initialization, rsetup):
 
     python = _safe_arg(sys.executable)
     if no_site:
-            python += ' -S'
+        python += ' -S'
 
     contents = script_template % dict(
         python = python,
@@ -1038,7 +1039,7 @@ def _distutils_script(path, dest, script_content, initialization, rsetup):
 
     python = _safe_arg(sys.executable)
     if no_site:
-            python += ' -S'
+        python += ' -S'
 
     contents = distutils_script_template % dict(
         python = python,
@@ -1121,7 +1122,7 @@ def _pyscript(path, dest, rsetup):
 
     python = _safe_arg(sys.executable)
     if no_site:
-            python += ' -S'
+        python += ' -S'
 
     contents = py_script_template % dict(
         python = python,

src/zc/buildout/isolation.txt

@@ -16,7 +16,8 @@ applications:
 
 2. Use a 'virtual environment
    <http://pypi.python.org/pypi/virtualenv>'_ that wraps a Python
-   installation in a way that hides 3rd-party modules.
+   installation in a way that hides 3rd-party modules.  `This is buildt
+   into Python 3.3 <http://docs.python.org/dev/library/venv.html>`_
 
 3. Use the -S Python option when bootstrapping buildout.  This will
    bypass the normal execution of the Python site.py file, which is
@@ -125,4 +126,5 @@ The -S option is also used when invoking setup scripts.
    3rd-party libraries that are added to the Python path regardless of
    whether site.py is loaded.  Still, even on Mac OS X, use of the -S
    option prevents some 3rd-party modules from being added to the
-   Python path,
+   Python path.
+