Nuitka-winsvc 1.8__cp311-cp311-win_amd64.whl → 2.4.8__cp311-cp311-win_amd64.whl

nuitka/tools/testing/Constructs.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Tools for construct tests.
 
 """
@@ -49,3 +35,19 @@ def generateConstructCases(construct_source_code):
             case = 1
 
     return "\n".join(case_1), "\n".join(case_2)
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/tools/testing/OutputComparison.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Tools to compare outputs of compiled and not compiled programs.
 
 There is a couple of replacements to be done for compiled programs to
@@ -70,7 +56,7 @@ def import_re_callback(match):
 
 tempfile_re = re.compile(r"/tmp/tmp[a-z0-9_]*")
 
-logging_info_re = re.compile(r"^Nuitka.*?:INFO")
+logging_info_re = re.compile(r"^Nuitka(-\w+)?:([-\w]+:)? ")
 logging_warning_re = re.compile(r"^Nuitka.*?:WARNING")
 
 # Python3.11 style traceback carets are not done by Nuitka (yet?)
@@ -78,6 +64,8 @@ syntax_error_caret_re = re.compile(r"^\s*~*\^*~*$")
 
 timing_re = re.compile(r"in [0-9]+.[0-9][0-9](s| seconds)")
 
+did_you_mean_re = re.compile(r"\. Did you mean: '.*?'\?")
+
 
 def makeDiffable(output, ignore_warnings, syntax_errors):
     # Of course many cases to deal with,
@@ -136,6 +124,8 @@ def makeDiffable(output, ignore_warnings, syntax_errors):
             continue
         if line.startswith("Nuitka:WARNING:     Complex topic"):
             continue
+        if line.startswith("Nuitka:WARNING:") and "matching checksum" in line:
+            continue
 
         if syntax_error_caret_re.match(line):
             continue
@@ -144,7 +134,30 @@ def makeDiffable(output, ignore_warnings, syntax_errors):
         line = thread_re.sub(r"Thread 0xXXXXXXXX", line)
         line = compiled_types_re.sub(r"\1", line)
         line = global_name_error_re.sub(r"\1\2\3", line)
+
         line = module_repr_re.sub(r"\1xxxxx\2", line)
+
+        # Frozen modules of 3.11, _imp._frozen_module_names
+        for module_name in (
+            "zipimport",
+            "abc",
+            "codecs",
+            "io",
+            "_collections_abc",
+            "_sitebuiltins",
+            "genericpath",
+            "ntpath",
+            "posixpath",
+            "os.path",
+            "os",
+            "site",
+            "stat",
+        ):
+            line = line.replace(
+                "<module '%s' (frozen)>" % module_name,
+                "<module '%s' from 'xxxxx'>" % module_name,
+            )
+
         line = non_ascii_error_rt.sub(r"\1 xxxx", line)
         line = timing_re.sub(r"in x.xx seconds", line)
 
@@ -166,6 +179,8 @@ def makeDiffable(output, ignore_warnings, syntax_errors):
 
         line = tempfile_re.sub(r"/tmp/tmpxxxxxxx", line)
 
+        line = did_you_mean_re.sub("", line)
+
         # This is a bug potentially, occurs only for CPython when re-directed,
         # we are going to ignore the issue as Nuitka is fine.
         if (
@@ -232,6 +247,11 @@ exceeded while calling a Python object' in \
             "super() argument 1 must be a type", "super() argument 1 must be type"
         )
 
+        # Ignore logger message on macOS that will have timestamps and program name
+        # that differ without forcing logger config to avoid it.
+        if "XType: Using static font registry" in line:
+            continue
+
         result.append(line)
 
     return result
@@ -263,3 +283,19 @@ def compareOutput(
         return 1
     else:
         return 0
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/tools/testing/Pythons.py

@@ -1,23 +1,8 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-""" Test tool to run a program with various Pythons. """
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
+""" Test tool to run a program with various Pythons. """
+
 from nuitka.PythonVersions import getSupportedPythonVersions
 from nuitka.utils.Execution import check_output
 from nuitka.utils.InstalledPythons import findPythons
@@ -31,3 +16,19 @@ def findAllPythons():
 
 def executeWithInstalledPython(python, args):
     return check_output([python.getPythonExe()] + args)
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/tools/testing/RuntimeTracing.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Runtime tracing
 
 At this time we detect DLLs used by a program with this code, such
@@ -94,7 +80,7 @@ def _takeSystemCallTraceOutput(logger, path, command):
     # tests may fail otherwise due to unexpected libs being loaded
     # spell-checker: ignore ENOENT,write_nocancel
     with withEnvironmentVarOverridden("LD_PRELOAD", None):
-        if os.environ.get("NUITKA_TRACE_COMMANDS", "0") != "0":
+        if os.getenv("NUITKA_TRACE_COMMANDS", "0") != "0":
             traceExecutedCommand("Tracing with:", command)
 
         _stdout_strace, stderr_strace, exit_strace = executeProcess(
@@ -126,7 +112,7 @@ def _takeSystemCallTraceOutput(logger, path, command):
             if b"ENOENT" in line:
                 continue
 
-            if line.startswith((b"write(", b"write_nocancel(")):
+            if line.startswith((b"write(", b"write_nocancel(", b"read(")):
                 continue
 
             if line.startswith((b"stat(", b"newfstatat(")) and b"S_IFDIR" in line:
@@ -257,3 +243,18 @@ def main():
 
 if __name__ == "__main__":
     main()
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/tools/testing/SearchModes.py

@@ -1,30 +1,16 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Search modes for Nuitka's test runner.
 
 The test runner can handle found errors, skip tests, etc. with search
 modes, which are implemented here.
 """
 
-import hashlib
 import os
 import sys
 
+from nuitka.__past__ import md5
 from nuitka.utils.FileOperations import (
     areSamePaths,
     getFileContents,
@@ -123,7 +109,7 @@ class SearchModeByPattern(SearchModeBase):
 
 
 class SearchModeResume(SearchModeBase):
-    def __init__(self, tests_path):
+    def __init__(self, tests_path, skip):
         SearchModeBase.__init__(self)
 
         tests_path = os.path.normcase(os.path.abspath(tests_path))
@@ -133,7 +119,7 @@ class SearchModeResume(SearchModeBase):
             tests_path = tests_path.encode("utf8")
             version = version.encode("utf8")
 
-        case_hash = hashlib.md5(tests_path)
+        case_hash = md5(tests_path)
         case_hash.update(version)
 
         from .Common import getTestingCacheDir
@@ -148,6 +134,7 @@ class SearchModeResume(SearchModeBase):
             self.resume_from = None
 
         self.active = not self.resume_from
+        self.skip = skip
 
     def consider(self, dirname, filename):
         parts = [dirname, filename]
@@ -166,6 +153,9 @@ class SearchModeResume(SearchModeBase):
         if areSamePaths(path, self.resume_from):
             self.active = True
 
+            if self.skip:
+                return False
+
         return self.active
 
     def finish(self):
@@ -200,3 +190,19 @@ class SearchModeOnly(SearchModeByPattern):
                 self.done = True
 
             return active
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/tools/testing/Valgrind.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Valgrind tool usage.
 
 We are using it for benchmarking purposes, as it's an analysis tool at the
@@ -99,3 +85,19 @@ def getBinarySizes(filename):
     sizes = sizes.split(b"\n")[-1].replace(b"\t", b"").split()
 
     return int(sizes[0]), int(sizes[1])
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/tools/testing/__init__.py

@@ -1,5 +1,8 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Dummy file to make this directory a package. """
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #
@@ -14,5 +17,3 @@
 #     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #     See the License for the specific language governing permissions and
 #     limitations under the License.
-#
-""" Dummy file to make this directory a package. """

nuitka/tools/testing/check_reference_counts/__init__.py

@@ -1,5 +1,8 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Dummy file to make this directory a package. """
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #
@@ -14,5 +17,3 @@
 #     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #     See the License for the specific language governing permissions and
 #     limitations under the License.
-#
-""" Dummy file to make this directory a package. """

nuitka/tools/testing/check_reference_counts/__main__.py

@@ -1,23 +1,8 @@
 #!/usr/bin/env python
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
-""" Tool to compare reference counting behaviour of CPython and Nuitka.
+
+""" Tool to compare reference counting behavior of CPython and Nuitka.
 
 """
 
@@ -101,3 +86,18 @@ if __name__ == "__main__":
     sys.path.insert(0, nuitka_package_dir)
 
     main()
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/tools/testing/compare_with_cpython/__init__.py

@@ -1,5 +1,8 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Dummy file to make this directory a package. """
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #
@@ -14,5 +17,3 @@
 #     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #     See the License for the specific language governing permissions and
 #     limitations under the License.
-#
-""" Dummy file to make this directory a package. """

nuitka/tools/testing/compare_with_cpython/__main__.py

@@ -1,35 +1,19 @@
 #!/usr/bin/env python
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
 
 """ Tool to compare output of CPython and Nuitka.
 
 """
 
-import hashlib
 import os
 import pickle
 import re
 import sys
 import time
 
+from nuitka.__past__ import md5
 from nuitka.OptionParsing import getNuitkaProjectOptions
-from nuitka.PythonVersions import python_version
 from nuitka.tools.testing.Common import (
     addToPythonPath,
     executeAfterTimePassed,
@@ -50,6 +34,7 @@ from nuitka.utils.Execution import (
     executeProcess,
     wrapCommandForDebuggerForSubprocess,
 )
+from nuitka.utils.FileOperations import deleteFile
 from nuitka.utils.Importing import getSharedLibrarySuffix
 from nuitka.utils.Timing import StopWatch
 
@@ -137,20 +122,20 @@ def getCPythonResults(cpython_cmd, cpython_cached, force_update, send_kill):
         if str is not bytes:
             hash_input = hash_input.encode("utf8")
 
-        command_hash = hashlib.md5(hash_input)
+        command_hash = md5(hash_input)
 
         for element in cpython_cmd:
             if os.path.exists(element):
                 with open(element, "rb") as element_file:
                     command_hash.update(element_file.read())
 
-        hash_salt = os.environ.get("NUITKA_HASH_SALT", "")
+        hash_salt = os.getenv("NUITKA_HASH_SALT", "")
 
         if str is not bytes:
             hash_salt = hash_salt.encode("utf8")
         command_hash.update(hash_salt)
 
-        if os.name == "nt" and python_version < 0x300:
+        if os.name == "nt" and str is bytes:
             curdir = os.getcwdu()  # spell-checker: ignore getcwdu
         else:
             curdir = os.getcwd()
@@ -235,9 +220,8 @@ def main():
     coverage_mode = hasArg("coverage")
     two_step_execution = hasArg("two_step_execution")
     binary_python_path = hasArg("binary_python_path")
-    keep_python_path = hasArg("keep_python_path")
     trace_command = (
-        hasArg("trace_command") or os.environ.get("NUITKA_TRACE_COMMANDS", "0") != "0"
+        hasArg("trace_command") or os.getenv("NUITKA_TRACE_COMMANDS", "0") != "0"
     )
     remove_output = hasArg("remove_output")
     remove_binary = not hasArg("--keep-binary")
@@ -264,6 +248,10 @@ def main():
     include_packages = hasArgValues("--include-package")
     include_modules = hasArgValues("--include-module")
     python_flag_m = hasArg("--python-flag=-m")
+    python_version = hasArgValue("--python-version")
+
+    if python_version:
+        python_version = tuple(int(d) for d in python_version.split("."))
 
     plugins_enabled = []
     for count, arg in reversed(tuple(enumerate(args))):
@@ -332,7 +320,7 @@ def main():
     if "PYTHON" not in os.environ:
         os.environ["PYTHON"] = sys.executable
 
-    extra_options = os.environ.get("NUITKA_EXTRA_OPTIONS", "").split()
+    extra_options = os.getenv("NUITKA_EXTRA_OPTIONS", "").split()
 
     if os.path.normcase(os.environ["PYTHON"]).endswith(("-dbg", "-debug", "_d.exe")):
         python_debug = True
@@ -386,6 +374,9 @@ Taking coverage of '{filename}' using '{python}' with flags {args} ...""".format
             % (repr(os.path.dirname(filename)), mini_script),
         ]
 
+        if python_version and python_version >= (3, 11):
+            cpython_cmd += ["-X", "frozen_modules=off"]
+
         if no_warnings:
             cpython_cmd[1:1] = [
                 "-W",
@@ -400,6 +391,9 @@ Taking coverage of '{filename}' using '{python}' with flags {args} ...""".format
                 "ignore",
             ]
 
+        if python_version and python_version >= (3, 11):
+            cpython_cmd += ["-X", "frozen_modules=off"]
+
         if python_flag_m:
             cpython_cmd += ["-m", os.path.basename(filename)]
             os.chdir(os.path.dirname(filename))
@@ -482,11 +476,9 @@ Taking coverage of '{filename}' using '{python}' with flags {args} ...""".format
     if binary_python_path:
         addToPythonPath(os.path.dirname(os.path.abspath(filename)))
 
-    if (keep_python_path or binary_python_path) and not coverage_mode:
-        extra_options.append("--execute-with-pythonpath")
-
     if report:
         extra_options.append("--report=%s" % report)
+        deleteFile(report, must_exist=False)
 
     if nofollow_imports or (not follow_imports and not standalone_mode):
         extra_options.append("--nofollow-imports")
@@ -767,7 +759,7 @@ Stderr was:
                 trace_result=False
             )
 
-            if not int(os.environ.get("NUITKA_CPYTHON_NO_CACHE_UPDATE", "0")):
+            if not int(os.getenv("NUITKA_CPYTHON_NO_CACHE_UPDATE", "0")):
                 if exit_code_stdout or exit_code_stderr or exit_code_return:
                     old_stdout_cpython = stdout_cpython
                     old_stderr_cpython = stderr_cpython
@@ -894,3 +886,18 @@ if __name__ == "__main__":
     sys.path.insert(0, nuitka_package_dir)
 
     main()
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.