[Checkins] SVN: zc.buildout/trunk/ Modernize "selecting-python" test to work w/2.6 and 2.5 instead of 2.4 and 2.3

Sat Nov 20 16:28:13 EST 2010

Log message for revision 118514:
  Modernize "selecting-python" test to work w/2.6 and 2.5 instead of 2.4 and 2.3
  

Changed:
  U   zc.buildout/trunk/src/zc/buildout/testselectingpython.py
  U   zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt

-=-
Modified: zc.buildout/trunk/src/zc/buildout/testselectingpython.py
===================================================================

--- zc.buildout/trunk/src/zc/buildout/testselectingpython.py	2010-11-20 21:04:07 UTC (rev 118513)
+++ zc.buildout/trunk/src/zc/buildout/testselectingpython.py	2010-11-20 21:28:13 UTC (rev 118514)
@@ -16,10 +16,11 @@
 import zc.buildout.tests
 import zc.buildout.testing
 
-if sys.version_info[:2] == (2, 4):
+
+if sys.version_info[:2] == (2, 5):
+    other_version = "2.6"
+else:
     other_version = "2.5"
-else:
-    other_version = "2.4"
 
 __test__ = dict(
     test_selecting_python_via_easy_install=

Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt	2010-11-20 21:04:07 UTC (rev 118513)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt	2010-11-20 21:28:13 UTC (rev 118514)
@@ -1,7 +1,7 @@
 Controlling which Python to use
 -------------------------------
 
-The following assumes that you have Python 2.4 installed.
+The following assumes that you have Python 2.5 installed.
 
 We can specify the python to use by specifying the name of a section
 to read the Python executable from.  The default is the section
@@ -11,21 +11,21 @@
 
     >>> print get(link_server),
     <html><body>
-    <a href="bigdemo-0.1-py2.4.egg">bigdemo-0.1-py2.4.egg</a><br>
-    <a href="demo-0.1-py2.4.egg">demo-0.1-py2.4.egg</a><br>
-    <a href="demo-0.2-py2.4.egg">demo-0.2-py2.4.egg</a><br>
-    <a href="demo-0.3-py2.4.egg">demo-0.3-py2.4.egg</a><br>
-    <a href="demo-0.4c1-py2.4.egg">demo-0.4c1-py2.4.egg</a><br>
+    <a href="bigdemo-0.1-py2.5.egg">bigdemo-0.1-py2.5.egg</a><br>
+    <a href="demo-0.1-py2.5.egg">demo-0.1-py2.5.egg</a><br>
+    <a href="demo-0.2-py2.5.egg">demo-0.2-py2.5.egg</a><br>
+    <a href="demo-0.3-py2.5.egg">demo-0.3-py2.5.egg</a><br>
+    <a href="demo-0.4c1-py2.5.egg">demo-0.4c1-py2.5.egg</a><br>
     <a href="demoneeded-1.0.zip">demoneeded-1.0.zip</a><br>
     <a href="demoneeded-1.1.zip">demoneeded-1.1.zip</a><br>
     <a href="demoneeded-1.2c1.zip">demoneeded-1.2c1.zip</a><br>
     <a href="extdemo-1.4.zip">extdemo-1.4.zip</a><br>
     <a href="index/">index/</a><br>
-    <a href="other-1.0-py2.4.egg">other-1.0-py2.4.egg</a><br>
+    <a href="other-1.0-py2.5.egg">other-1.0-py2.5.egg</a><br>
     </body></html>
 
 We have a sample buildout.  Let's update its configuration file to
-install the demo package using Python 2.4.
+install the demo package using Python 2.5.
 
     >>> write(sample_buildout, 'buildout.cfg',
     ... """
@@ -34,14 +34,14 @@
     ... eggs-directory = eggs
     ... index = http://www.python.org/pypi/
     ...
-    ... [python2.4]
+    ... [python2.5]
     ... executable = %(python24)s
     ...
     ... [demo]
     ... recipe = zc.recipe.egg
     ... eggs = demo <0.3
     ... find-links = %(server)s
-    ... python = python2.4
+    ... python = python2.5
     ... interpreter = py-demo
     ... """ % dict(server=link_server, python24=other_executable))
 
@@ -59,15 +59,15 @@
    Generated script '/sample-buildout/bin/demo'.
    Generated interpreter '/sample-buildout/bin/py-demo'.
 
-we'll get the Python 2.4 eggs for demo and demoneeded:
+we'll get the Python 2.5 eggs for demo and demoneeded:
 
     >>> ls(sample_buildout, 'eggs')
-    -  demo-0.2-py2.4.egg
-    -  demoneeded-1.2c1-py2.4.egg
+    -  demo-0.2-py2.5.egg
+    -  demoneeded-1.2c1-py2.5.egg
     d  setuptools-0.6-py2.5.egg
     -  zc.buildout-1.0-py2.5.egg
 
-And the generated scripts invoke Python 2.4:
+And the generated scripts invoke Python 2.5:
 
     >>> import sys
     >>> if sys.platform == 'win32':
@@ -84,8 +84,8 @@
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
-      '/sample-buildout/eggs/demo-0.2-py2.4.egg',
-      '/sample-buildout/eggs/demoneeded-1.2c1-py2.4.egg',
+      '/sample-buildout/eggs/demo-0.2-py2.5.egg',
+      '/sample-buildout/eggs/demoneeded-1.2c1-py2.5.egg',
       ]
     <BLANKLINE>
     import eggrecipedemo
@@ -108,8 +108,8 @@
     import sys
     <BLANKLINE>
     sys.path[0:0] = [
-      '/sample-buildout/eggs/demo-0.2-py2.4.egg',
-      '/sample-buildout/eggs/demoneeded-1.2c1-py2.4.egg',
+      '/sample-buildout/eggs/demo-0.2-py2.5.egg',
+      '/sample-buildout/eggs/demoneeded-1.2c1-py2.5.egg',
       ]
     <BLANKLINE>
     _interactive = True

