[cig-commits] r5230 - in cs/merlin/trunk: merlin merlin/jail merlin.egg-info

[leif at geodynamics.org]

Author: leif
Date: 2006-11-09 17:49:48 -0800 (Thu, 09 Nov 2006)
New Revision: 5230

Added:
   cs/merlin/trunk/merlin/jail/
   cs/merlin/trunk/merlin/jail/__init__.py
   cs/merlin/trunk/merlin/jail/ez_setup.py
   cs/merlin/trunk/merlin/jail/setuptools.py
Modified:
   cs/merlin/trunk/merlin.egg-info/SOURCES.txt
   cs/merlin/trunk/merlin/sandbox.py
Log:
Added 'jail'.  This, in conjunction with the existing
'sandbox.py', prevents setuptools-based 'setup.py' scripts
from downloading/importing setuptools (which would bomb
anyway).  I'm not sure what to do about packages which
then use pkg_resources at runtime...


Added: cs/merlin/trunk/merlin/jail/__init__.py
===================================================================

Added: cs/merlin/trunk/merlin/jail/ez_setup.py
===================================================================
--- cs/merlin/trunk/merlin/jail/ez_setup.py	2006-11-10 00:48:51 UTC (rev 5229)
+++ cs/merlin/trunk/merlin/jail/ez_setup.py	2006-11-10 01:49:48 UTC (rev 5230)
@@ -0,0 +1,11 @@
+
+import os, sys
+
+DEFAULT_VERSION = "0.6c3"
+DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
+
+def use_setuptools(version=DEFAULT_VERSION,
+                   download_base=DEFAULT_URL,
+                   to_dir=os.curdir,
+                   download_delay=15):
+    return

Added: cs/merlin/trunk/merlin/jail/setuptools.py
===================================================================
--- cs/merlin/trunk/merlin/jail/setuptools.py	2006-11-10 00:48:51 UTC (rev 5229)
+++ cs/merlin/trunk/merlin/jail/setuptools.py	2006-11-10 01:49:48 UTC (rev 5230)
@@ -0,0 +1,2 @@
+
+from merlin import *

Modified: cs/merlin/trunk/merlin/sandbox.py
===================================================================
--- cs/merlin/trunk/merlin/sandbox.py	2006-11-10 00:48:51 UTC (rev 5229)
+++ cs/merlin/trunk/merlin/sandbox.py	2006-11-10 01:49:48 UTC (rev 5230)
@@ -23,6 +23,8 @@
         try:
             sys.argv[:] = [setup_script]+list(args)
             sys.path.insert(0, setup_dir)
+            import merlin.jail as jail
+            sys.path.insert(0, os.path.dirname(jail.__file__))
             DirectorySandbox(setup_dir).run(
                 lambda: execfile(
                     "setup.py",

Modified: cs/merlin/trunk/merlin.egg-info/SOURCES.txt
===================================================================
--- cs/merlin/trunk/merlin.egg-info/SOURCES.txt	2006-11-10 00:48:51 UTC (rev 5229)
+++ cs/merlin/trunk/merlin.egg-info/SOURCES.txt	2006-11-10 01:49:48 UTC (rev 5230)
@@ -50,6 +50,9 @@
 merlin/command/setopt.py
 merlin/command/test.py
 merlin/command/upload.py
+merlin/jail/__init__.py
+merlin/jail/ez_setup.py
+merlin/jail/setuptools.py
 merlin/tests/__init__.py
 merlin/tests/doctest.py
 merlin/tests/test_resources.py