[Checkins] SVN: zc.buildout/trunk/ Make zc.buildout a bit more compatible with PyPy.

Martijn Faassen faassen at startifact.com
Sun Dec 12 14:07:45 EST 2010


Log message for revision 118848:
  Make zc.buildout a bit more compatible with PyPy.
  

Changed:
  U   zc.buildout/trunk/CHANGES.txt
  U   zc.buildout/trunk/DEVELOPERS.txt
  U   zc.buildout/trunk/src/zc/buildout/easy_install.py

-=-
Modified: zc.buildout/trunk/CHANGES.txt
===================================================================
--- zc.buildout/trunk/CHANGES.txt	2010-12-12 19:00:00 UTC (rev 118847)
+++ zc.buildout/trunk/CHANGES.txt	2010-12-12 19:07:45 UTC (rev 118848)
@@ -4,7 +4,14 @@
 1.5.3 (unreleased)
 ==================
 
+- changed broken dash S check to pass the configuration options
+  -S -c separately, to make zc.buildout more compatible with the PyPy
+  interpreter, which has less flexible argument parsing than CPython.
 
+  Note that PyPy post 1.4.0 is needed to make buildout work at all,
+  due to missing support for the ``-E`` option, which only got added
+  afterwards.
+
 1.5.2 (2010-10-11)
 ==================
 

Modified: zc.buildout/trunk/DEVELOPERS.txt
===================================================================
--- zc.buildout/trunk/DEVELOPERS.txt	2010-12-12 19:00:00 UTC (rev 118847)
+++ zc.buildout/trunk/DEVELOPERS.txt	2010-12-12 19:07:45 UTC (rev 118848)
@@ -14,4 +14,8 @@
 
 - You should have specific python versions at specific locations or
   PYTHONx.x environment variables pointing to those
-  See zc.buildout testing.py, def find_python(version)
\ No newline at end of file
+  See zc.buildout testing.py, def find_python(version)
+
+  The way to start the tests for Python 2.5 for instance would be::
+
+    $ env PYTHON2.5=/path/to/python2.5 bin/test

Modified: zc.buildout/trunk/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.py	2010-12-12 19:00:00 UTC (rev 118847)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.py	2010-12-12 19:07:45 UTC (rev 118848)
@@ -92,7 +92,7 @@
     # file does not pass the -script.py's returncode back properly, at least in
     # some circumstances. Therefore...print statements.
     stdout, stderr = subprocess.Popen(
-        [executable, '-Sc',
+        [executable, '-S', '-c',
          'try:\n'
          '    import ConfigParser\n'
          'except ImportError:\n'



More information about the checkins mailing list