Commits

Anonymous committed 2b92bbe

Get rid of the ugly Jython hack since the subprocess module is now always available

  • Participants
  • Parent commits c89a7cb
  • Branches 0.6-maintenance

Comments (0)

Files changed (1)

File distribute_setup.py

 from distutils import log
 
 
-IS_JYTHON = sys.platform.startswith('java')
 DEFAULT_VERSION = "0.6.2"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_PKG_INFO = """\
 def python_cmd(cmd):
     python = quote(sys.executable)
     cmd = quote(cmd)
-    if IS_JYTHON:
-        return subprocess.Popen([python, cmd]).wait() == 0
-    args = [os.P_WAIT, python, python] + cmd.split() + [os.environ]
-    return os.spawnle(*args) == 0
+    return subprocess.call([python, cmd])
 
 
 def _install(tarball):
     log.warn('Relaunching...')
     # we have to relaunch the process
     args = [sys.executable] + sys.argv
-    if IS_JYTHON:
-        sys.exit(subprocess.call(args))
-    else:
-        sys.exit(os.spawnv(os.P_WAIT, sys.executable, args))
+    sys.exit(subprocess.call(args))
 
 
 def extractall(self, path=".", members=None):