non-ASCII path (path to the Python executable). Open and write the script in binary mode, but ensure that the shebang is decodable from UTF-8 and from the encoding of the script.
This commit is contained in:
parent
cd9dd37974
commit
1947477072
|
@ -11,9 +11,10 @@ from distutils.core import Command
|
||||||
from distutils.dep_util import newer
|
from distutils.dep_util import newer
|
||||||
from distutils.util import convert_path, Mixin2to3
|
from distutils.util import convert_path, Mixin2to3
|
||||||
from distutils import log
|
from distutils import log
|
||||||
|
import tokenize
|
||||||
|
|
||||||
# check if Python is called on the first line with this expression
|
# check if Python is called on the first line with this expression
|
||||||
first_line_re = re.compile('^#!.*python[0-9.]*([ \t].*)?$')
|
first_line_re = re.compile(b'^#!.*python[0-9.]*([ \t].*)?$')
|
||||||
|
|
||||||
class build_scripts(Command):
|
class build_scripts(Command):
|
||||||
|
|
||||||
|
@ -74,12 +75,14 @@ class build_scripts(Command):
|
||||||
# that way, we'll get accurate feedback if we can read the
|
# that way, we'll get accurate feedback if we can read the
|
||||||
# script.
|
# script.
|
||||||
try:
|
try:
|
||||||
f = open(script, "r")
|
f = open(script, "rb")
|
||||||
except IOError:
|
except IOError:
|
||||||
if not self.dry_run:
|
if not self.dry_run:
|
||||||
raise
|
raise
|
||||||
f = None
|
f = None
|
||||||
else:
|
else:
|
||||||
|
encoding, lines = tokenize.detect_encoding(f.readline)
|
||||||
|
f.seek(0)
|
||||||
first_line = f.readline()
|
first_line = f.readline()
|
||||||
if not first_line:
|
if not first_line:
|
||||||
self.warn("%s is an empty file (skipping)" % script)
|
self.warn("%s is an empty file (skipping)" % script)
|
||||||
|
@ -88,25 +91,45 @@ class build_scripts(Command):
|
||||||
match = first_line_re.match(first_line)
|
match = first_line_re.match(first_line)
|
||||||
if match:
|
if match:
|
||||||
adjust = True
|
adjust = True
|
||||||
post_interp = match.group(1) or ''
|
post_interp = match.group(1) or b''
|
||||||
|
|
||||||
if adjust:
|
if adjust:
|
||||||
log.info("copying and adjusting %s -> %s", script,
|
log.info("copying and adjusting %s -> %s", script,
|
||||||
self.build_dir)
|
self.build_dir)
|
||||||
updated_files.append(outfile)
|
updated_files.append(outfile)
|
||||||
if not self.dry_run:
|
if not self.dry_run:
|
||||||
outf = open(outfile, "w")
|
|
||||||
if not sysconfig.python_build:
|
if not sysconfig.python_build:
|
||||||
outf.write("#!%s%s\n" %
|
executable = self.executable
|
||||||
(self.executable,
|
|
||||||
post_interp))
|
|
||||||
else:
|
else:
|
||||||
outf.write("#!%s%s\n" %
|
executable = os.path.join(
|
||||||
(os.path.join(
|
|
||||||
sysconfig.get_config_var("BINDIR"),
|
sysconfig.get_config_var("BINDIR"),
|
||||||
"python%s%s" % (sysconfig.get_config_var("VERSION"),
|
"python%s%s" % (sysconfig.get_config_var("VERSION"),
|
||||||
sysconfig.get_config_var("EXE"))),
|
sysconfig.get_config_var("EXE")))
|
||||||
post_interp))
|
executable = os.fsencode(executable)
|
||||||
|
shebang = b"#!" + executable + post_interp + b"\n"
|
||||||
|
# Python parser starts to read a script using UTF-8 until
|
||||||
|
# it gets a #coding:xxx cookie. The shebang has to be the
|
||||||
|
# first line of a file, the #coding:xxx cookie cannot be
|
||||||
|
# written before. So the shebang has to be decodable from
|
||||||
|
# UTF-8.
|
||||||
|
try:
|
||||||
|
shebang.decode('utf-8')
|
||||||
|
except UnicodeDecodeError:
|
||||||
|
raise ValueError(
|
||||||
|
"The shebang ({!r}) is not decodable "
|
||||||
|
"from utf-8".format(shebang))
|
||||||
|
# If the script is encoded to a custom encoding (use a
|
||||||
|
# #coding:xxx cookie), the shebang has to be decodable from
|
||||||
|
# the script encoding too.
|
||||||
|
try:
|
||||||
|
shebang.decode(encoding)
|
||||||
|
except UnicodeDecodeError:
|
||||||
|
raise ValueError(
|
||||||
|
"The shebang ({!r}) is not decodable "
|
||||||
|
"from the script encoding ({})"
|
||||||
|
.format(shebang, encoding))
|
||||||
|
outf = open(outfile, "wb")
|
||||||
|
outf.write(shebang)
|
||||||
outf.writelines(f.readlines())
|
outf.writelines(f.readlines())
|
||||||
outf.close()
|
outf.close()
|
||||||
if f:
|
if f:
|
||||||
|
|
|
@ -143,6 +143,11 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #10419, #6011: build_scripts command of distutils handles correctly
|
||||||
|
non-ASCII path (path to the Python executable). Open and write the script in
|
||||||
|
binary mode, but ensure that the shebang is decodable from UTF-8 and from the
|
||||||
|
encoding of the script.
|
||||||
|
|
||||||
- Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in
|
- Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in
|
||||||
order to accept exactly one connection. Patch by Daniel Evers.
|
order to accept exactly one connection. Patch by Daniel Evers.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue