Upgrade to Cheetah 2.2.2

scripts/scramble/lib/get_platform.py

@@ -0,0 +1,18 @@
+"""
+Monkeypatch get_platform since it's broken on OS X versions of Python 2.5
+"""
+import os, sys
+from distutils.sysconfig import get_config_vars
+if sys.platform == 'darwin' and get_config_vars().get('UNIVERSALSDK', '').strip():
+    # Has to be before anything imports pkg_resources
+    def _get_platform_monkeypatch():
+        plat = distutils.util._get_platform()
+        if plat.startswith( 'macosx-' ):
+            plat = 'macosx-10.3-fat'
+        return plat
+    import distutils.util
+    try:
+        assert distutils.util._get_platform
+    except:
+        distutils.util._get_platform = distutils.util.get_platform
+        distutils.util.get_platform = _get_platform_monkeypatch

scripts/scramble/scripts/Cheetah.py

@@ -7,6 +7,7 @@ if os.path.dirname( sys.argv[0] ) != "":
 # find setuptools
 scramble_lib = os.path.join( "..", "..", "..", "lib" )
 sys.path.append( scramble_lib )
+import get_platform # fixes fat python 2.5
 from ez_setup import use_setuptools
 use_setuptools( download_delay=8, to_dir=scramble_lib )
 from setuptools import *
@@ -25,20 +26,26 @@ for dir in [ "build", "dist" ]:
         shutil.rmtree( dir )
 
 # patch
-for file in [ "src/NameMapper.py", "src/Tests/NameMapper.py" ]:
-    if not os.access( "%s.orig" %file, os.F_OK ):
-        print "scramble_it(): Patching", file
-        shutil.copyfile( file, "%s.orig" %file )
-        i = open( "%s.orig" %file, "r" )
-        o = open( file, "w" )
-        for line in i.readlines():
-            if line.startswith("__author__ ="):
-                print >>o, "from __future__ import generators"
-            elif line == "from __future__ import generators\n":
-                continue
+file = "SetupConfig.py"
+if not os.access( "%s.orig" %file, os.F_OK ):
+    print "scramble.py(): Patching", file
+    shutil.copyfile( file, "%s.orig" %file )
+    i = open( "%s.orig" %file, "r" )
+    o = open( file, "w" )
+    comment = False
+    for line in i.readlines():
+        if line == "        install_requires = [\n":
+            comment = True
+            print >>o, "#" + line,
+        elif comment and line == "        ]\n":
+            comment = False
+            print >>o, "#" + line,
+        elif comment:
+            print >>o, "#" + line,
+        else:
             print >>o, line,
-        i.close()
-        o.close()
+    i.close()
+    o.close()
 
 # reset args for distutils
 me = sys.argv[0]

scripts/scramble/scripts/DRMAA_python.py

@@ -12,6 +12,7 @@ if os.path.dirname( sys.argv[0] ) != "":
 # find setuptools
 scramble_lib = os.path.join( "..", "..", "..", "lib" )
 sys.path.append( scramble_lib )
+import get_platform # fixes fat python 2.5
 try:
     from setuptools import *
     import pkg_resources

scripts/scramble/scripts/MySQL_python.py

@@ -57,6 +57,7 @@ if os.path.dirname( sys.argv[0] ) != "":
 # find setuptools
 scramble_lib = os.path.join( "..", "..", "..", "lib" )
 sys.path.append( scramble_lib )
+import get_platform # fixes fat python 2.5
 from ez_setup import use_setuptools
 use_setuptools( download_delay=8, to_dir=scramble_lib )
 from setuptools import *

scripts/scramble/scripts/generic.py

@@ -7,6 +7,7 @@ if os.path.dirname( sys.argv[0] ) != "":
 # find setuptools
 scramble_lib = os.path.join( "..", "..", "..", "lib" )
 sys.path.append( scramble_lib )
+import get_platform # fixes fat python 2.5
 from ez_setup import use_setuptools
 use_setuptools( download_delay=8, to_dir=scramble_lib )
 from setuptools import *

scripts/scramble/scripts/pbs_python.py

@@ -12,6 +12,7 @@ if os.path.dirname( sys.argv[0] ) != "":
 # find setuptools
 scramble_lib = os.path.join( "..", "..", "..", "lib" )
 sys.path.append( scramble_lib )
+import get_platform # fixes fat python 2.5
 try:
     from setuptools import *
     import pkg_resources

scripts/scramble/scripts/psycopg2.py

@@ -59,6 +59,7 @@ if os.path.dirname( sys.argv[0] ) != "":
 # find setuptools
 scramble_lib = os.path.join( "..", "..", "..", "lib" )
 sys.path.append( scramble_lib )
+import get_platform # fixes fat python 2.5
 try:
     from setuptools import *
     import pkg_resources

scripts/scramble/scripts/pysqlite.py

@@ -21,6 +21,7 @@ if os.path.dirname( sys.argv[0] ) != "":
 # find setuptools
 scramble_lib = os.path.join( "..", "..", "..", "lib" )
 sys.path.append( scramble_lib )
+import get_platform # fixes fat python 2.5
 try:
     from setuptools import *
     import pkg_resources

scripts/scramble/scripts/python_lzo.py

@@ -54,6 +54,7 @@ if os.path.dirname( sys.argv[0] ) != "":
 # find setuptools
 scramble_lib = os.path.join( "..", "..", "..", "lib" )
 sys.path.append( scramble_lib )
+import get_platform # fixes fat python 2.5
 try:
     from setuptools import *
     import pkg_resources