[Checkins] SVN: z3ext.layoutform/trunk/

[Nikolay Kim]

Log message for revision 93410:
  

Changed:
  U   z3ext.layoutform/trunk/bootstrap.py
  U   z3ext.layoutform/trunk/src/z3ext/layoutform/tests/tests.txt

-=-
Modified: z3ext.layoutform/trunk/bootstrap.py
===================================================================
--- z3ext.layoutform/trunk/bootstrap.py	2008-11-27 17:53:32 UTC (rev 93409)
+++ z3ext.layoutform/trunk/bootstrap.py	2008-11-27 18:03:27 UTC (rev 93410)
@@ -17,34 +17,59 @@
 The script accepts buildout command-line options, so you can
 use the -c option to specify an alternate configuration file.
 
-$Id: bootstrap.py 1797 2008-03-19 07:33:05Z fafhrd91 $
+$Id$
 """
 
 import os, shutil, sys, tempfile, urllib2
 
 tmpeggs = tempfile.mkdtemp()
 
-ez = {}
-exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
-                     ).read() in ez
-ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+is_jython = sys.platform.startswith('java')
 
-import pkg_resources
+try:
+    import pkg_resources
+except ImportError:
+    ez = {}
+    exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+                         ).read() in ez
+    ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
 
-cmd = 'from setuptools.command.easy_install import main; main()'
+    import pkg_resources
+
 if sys.platform == 'win32':
-    cmd = '"%s"' % cmd # work around spawn lamosity on windows
+    def quote(c):
+        if ' ' in c:
+            return '"%s"' % c # work around spawn lamosity on windows
+        else:
+            return c
+else:
+    def quote (c):
+        return c
 
-ws = pkg_resources.working_set
-assert os.spawnle(
-    os.P_WAIT, sys.executable, sys.executable,
-    '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
-    dict(os.environ,
-         PYTHONPATH=
-         ws.find(pkg_resources.Requirement.parse('setuptools')).location
-         ),
-    ) == 0
+cmd = 'from setuptools.command.easy_install import main; main()'
+ws  = pkg_resources.working_set
 
+if is_jython:
+    import subprocess
+    
+    assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd', 
+           quote(tmpeggs), 'zc.buildout'], 
+           env=dict(os.environ,
+               PYTHONPATH=
+               ws.find(pkg_resources.Requirement.parse('setuptools')).location
+               ),
+           ).wait() == 0
+
+else:
+    assert os.spawnle(
+        os.P_WAIT, sys.executable, quote (sys.executable),
+        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout',
+        dict(os.environ,
+            PYTHONPATH=
+            ws.find(pkg_resources.Requirement.parse('setuptools')).location
+            ),
+        ) == 0
+
 ws.add_entry(tmpeggs)
 ws.require('zc.buildout')
 import zc.buildout.buildout

Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/tests/tests.txt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/tests/tests.txt	2008-11-27 17:53:32 UTC (rev 93409)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/tests/tests.txt	2008-11-27 18:03:27 UTC (rev 93410)
@@ -8,7 +8,7 @@
   >>> from zope import interface, schema
 
   >>> class AgeError(schema.interfaces.ValidationError):
-  ...     __doc__ = _("""Minimu age is 20 years.""")
+  ...     __doc__ = u"""Minimu age is 20 years."""
 
   >>> class IPerson(interface.Interface):
   ...