Supply a copy of _optim_args_from_interpreter_flags for Python 3.5 compatibility. Ref pypa/setuptools#2357.

2 files changed, 22 insertions, 1 deletions

diff --git a/distutils/py35compat.py b/distutils/py35compat.py
new file mode 100644
index 00000000..79b2e7f3
--- /dev/null
+++ b/distutils/py35compat.py
@@ -0,0 +1,19 @@
+import sys
+import subprocess
+
+
+def __optim_args_from_interpreter_flags():
+    """Return a list of command-line arguments reproducing the current
+    optimization settings in sys.flags."""
+    args = []
+    value = sys.flags.optimize
+    if value > 0:
+        args.append("-" + "O" * value)
+    return args
+
+
+_optim_args_from_interpreter_flags = getattr(
+    subprocess,
+    "_optim_args_from_interpreter_flags",
+    __optim_args_from_interpreter_flags,
+)
diff --git a/distutils/util.py b/distutils/util.py
index 9d6c5cbd..f5aca794 100644
--- a/distutils/util.py
+++ b/distutils/util.py
@@ -14,6 +14,8 @@ from distutils.dep_util import newer
 from distutils.spawn import spawn
 from distutils import log
 from distutils.errors import DistutilsByteCompileError
+from .py35compat import _optim_args_from_interpreter_flags
+
 
 def get_host_platform():
     """Return a string that identifies the current platform.  This is used mainly to
@@ -420,7 +422,7 @@ byte_compile(files, optimize=%r, force=%r,
 """ % (optimize, force, prefix, base_dir, verbose))
 
         cmd = [sys.executable]
-        cmd.extend(subprocess._optim_args_from_interpreter_flags())
+        cmd.extend(_optim_args_from_interpreter_flags())
         cmd.append(script_name)
         spawn(cmd, dry_run=dry_run)
         execute(os.remove, (script_name,), "removing %s" % script_name,