Commit 87cb4b31 authored by Jim Fulton's avatar Jim Fulton

Python 2.4 and 2.5 compat

parent aebea833
...@@ -72,4 +72,6 @@ if sys.platform.startswith('java'): ...@@ -72,4 +72,6 @@ if sys.platform.startswith('java'):
# Jython needs the script to be called twice via sys.executable # Jython needs the script to be called twice via sys.executable
assert subprocess.Popen([sys.executable] + [bin_buildout]).wait() == 0 assert subprocess.Popen([sys.executable] + [bin_buildout]).wait() == 0
if sys.version_info < (2, 6):
bin_buildout = [bin_buildout, '-c2.4.cfg']
sys.exit(subprocess.Popen(bin_buildout).wait()) sys.exit(subprocess.Popen(bin_buildout).wait())
...@@ -1159,7 +1159,7 @@ We have a link server that has a number of eggs: ...@@ -1159,7 +1159,7 @@ We have a link server that has a number of eggs:
And that the source directory contains the compiled extension: And that the source directory contains the compiled extension:
>>> contents = os.listdir(extdemo) >>> contents = os.listdir(extdemo)
>>> any([f for f in contents if f.endswith(('.so', '.pyd'))]) >>> bool([f for f in contents if f.endswith('.so') or f.endswith('.pyd')])
True True
Download cache Download cache
......
...@@ -541,7 +541,7 @@ Our develop-eggs now includes an egg link for extdemo: ...@@ -541,7 +541,7 @@ Our develop-eggs now includes an egg link for extdemo:
and the extdemo now has a built extension: and the extdemo now has a built extension:
>>> contents = os.listdir(extdemo) >>> contents = os.listdir(extdemo)
>>> any([f for f in contents if f.endswith(('.so', '.pyd'))]) >>> bool([f for f in contents if f.endswith('.so') or f.endswith('.pyd')])
True True
Because develop eggs take precedence over non-develop eggs, the demo Because develop eggs take precedence over non-develop eggs, the demo
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment