[Jython-checkins] jython: Fix distutils such that the executable is properly fixed up for Jython.

jim.baker jython-checkins at python.org
Mon Dec 14 20:07:06 EST 2015


https://hg.python.org/jython/rev/35a4e3b03f79
changeset:   7837:35a4e3b03f79
user:        Jim Baker <jim.baker at rackspace.com>
date:        Mon Dec 14 18:06:48 2015 -0700
summary:
  Fix distutils such that the executable is properly fixed up for Jython.

This was preventing installation of the bottle package.

files:
  Lib/distutils/command/build_scripts.py |  11 +++++------
  1 files changed, 5 insertions(+), 6 deletions(-)


diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py
--- a/Lib/distutils/command/build_scripts.py
+++ b/Lib/distutils/command/build_scripts.py
@@ -4,7 +4,9 @@
 
 __revision__ = "$Id$"
 
-import os, re
+import os
+import re
+import sys
 from stat import ST_MODE
 from distutils.core import Command
 from distutils.dep_util import newer
@@ -92,10 +94,7 @@
             if adjust:
                 log.info("copying and adjusting %s -> %s", script,
                          self.build_dir)
-                print "###############"
-                print executable
-                executable = fix_jython_executable(executable, post_interp)
-                print executable
+                self.executable = fix_jython_executable(self.executable, post_interp)
                 if not self.dry_run:
                     outf = open(outfile, "w")
                     if not _sysconfig.is_python_build():
@@ -158,4 +157,4 @@
                      " more information.")
         else:
             return '/usr/bin/env %s' % executable
-    return executable
\ No newline at end of file
+    return executable

-- 
Repository URL: https://hg.python.org/jython


More information about the Jython-checkins mailing list