fixup! bpo-2506: Add -X noopt command line option

python · pablogsal · Aug 31, 2020 · Aug 31, 2020 · Aug 31, 2020 · Sep 2, 2020
commit 1b9e8f62bbee63baab24b98af0ed85a75f3f5335
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
@@ -1430,9 +1430,9 @@ an :term:`importer`.
    of *optimization* can only be alphanumeric, else :exc:`ValueError` is raised.
 
    The *noopt* parameter is used to specify if compiler optimization are
-   disabled. If it is true, *optimization* is ignored and ``.noopt`` suffix is
-   used (ex: ``baz.cpython-32.noopt.pyc``). If it is ``None``, use
-   ``sys.flags.noopt`` value.
+   disabled. If it is true, disable compiler optimizations, *optimization* is
+   ignored and ``.noopt`` suffix is used (ex: ``baz.cpython-32.noopt.pyc``). If
+   it is ``None``, use ``sys.flags.noopt`` value.
 
    The *debug_override* parameter is deprecated and can be used to override
    the system's value for ``__debug__``. A ``True`` value is the equivalent of

diff --git a/Doc/library/py_compile.rst b/Doc/library/py_compile.rst
@@ -27,7 +27,7 @@ byte-code cache files in the directory containing the source code.
    Exception raised when an error occurs while attempting to compile the file.
 
 
-.. function:: compile(file, cfile=None, dfile=None, doraise=False, optimize=-1, invalidation_mode=PycInvalidationMode.TIMESTAMP, quiet=0)
+.. function:: compile(file, cfile=None, dfile=None, doraise=False, optimize=-1, invalidation_mode=PycInvalidationMode.TIMESTAMP, quiet=0, noopt=None)
 
    Compile a source file to byte-code and write out the byte-code cache file.
    The source code is loaded from the file named *file*.  The byte-code is

diff --git a/Include/compile.h b/Include/compile.h
@@ -106,7 +106,7 @@ PyAPI_FUNC(int) _PyAST_Optimize(struct _mod *, PyArena *arena, _PyASTOptimizeSta
 /* This doesn't need to match anything */
 #define Py_fstring_input 800
 
-/* Value of 'optimize' to deactivate all optimizations */
+/* Value of 'optimize' to disable all optimizations */
 #define _PyCompiler_disable_all_optimizations  -2
 
 #endif /* !Py_COMPILE_H */
diff --git a/Include/cpython/initconfig.h b/Include/cpython/initconfig.h
@@ -425,7 +425,7 @@ typedef struct {
 
        If equal to 1, enable compiler optimizations.
 
-       Set to 0 by -X noopt. */
+       Set to 0 by -X noopt. It's default value is 1 */
     int optimize;
 
 } PyConfig;

diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
@@ -1,5 +1,6 @@
 # Minimal tests for dis module
 
+from test import support
 from test.support import captured_stdout
 from test.support.bytecode_helper import BytecodeTestCase
 import unittest

diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
@@ -1068,7 +1068,7 @@ def test_init_parse_argv(self):
         config = {
             'parse_argv': 1,
             'argv': ['-c', 'arg1', '-v', 'arg3'],
-            'orig_argv': ['./argv0', '-E', '-c', 'pass', 'arg1', '-v', 'arg3'],
+            'orig_argv': ['./argv0', '-E', '-X', 'noopt', '-c', 'pass', 'arg1', '-v', 'arg3'],
             'program_name': './argv0',
             'run_command': 'pass\n',
             'use_environment': 0,
@@ -1084,7 +1084,7 @@ def test_init_dont_parse_argv(self):
         config = {
             'parse_argv': 0,
             'argv': ['./argv0', '-E', '-X', 'noopt', '-c', 'pass', 'arg1', '-v', 'arg3'],
-            'orig_argv': ['./argv0', '-E', '-c', 'pass', 'arg1', '-v', 'arg3'],
+            'orig_argv': ['./argv0', '-E', '-X', 'noopt', '-c', 'pass', 'arg1', '-v', 'arg3'],
             'program_name': './argv0',
         }
         self.check_all_configs("test_init_dont_parse_argv", config, pre_config,