Issue #12451: distutils now opens the setup script in binary mode to read the
encoding cookie, instead of opening it in UTF-8.
diff --git a/Lib/distutils/core.py b/Lib/distutils/core.py
index fd2a43d..c0a04de 100644
--- a/Lib/distutils/core.py
+++ b/Lib/distutils/core.py
@@ -8,7 +8,8 @@
__revision__ = "$Id$"
-import sys, os
+import os
+import sys
from distutils.debug import DEBUG
from distutils.errors import *
@@ -215,11 +216,8 @@
sys.argv[0] = script_name
if script_args is not None:
sys.argv[1:] = script_args
- f = open(script_name)
- try:
+ with open(script_name, 'rb') as f:
exec(f.read(), g, l)
- finally:
- f.close()
finally:
sys.argv = save_argv
_setup_stop_after = None
diff --git a/Misc/NEWS b/Misc/NEWS
index 51a7d57..9419f67 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,6 +25,9 @@
Library
-------
+- Issue #12451: distutils now opens the setup script in binary mode to read the
+ encoding cookie, instead of opening it in UTF-8.
+
- Issue #9516: On Mac OS X, change Distutils to no longer globally attempt to
check or set the MACOSX_DEPLOYMENT_TARGET environment variable for the
interpreter process. This could cause failures in non-Distutils subprocesses