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

nuitka/distutils/DistutilCommands.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
+
+
 """ Nuitka distutils integration.
 
 """
@@ -34,6 +20,11 @@ from nuitka.importing.Importing import (
     flushImportCache,
     locateModule,
 )
+from nuitka.PythonVersions import python_version
+from nuitka.reports.CompilationReportReader import (
+    getEmbeddedDataFilenames,
+    parseCompilationReport,
+)
 from nuitka.Tracing import wheel_logger
 from nuitka.utils.Execution import check_call
 from nuitka.utils.FileOperations import deleteFile, getFileList, renameFile
@@ -44,6 +35,7 @@ def setupNuitkaDistutilsCommands(dist, keyword, value):
     # If the user project setup.py includes the key "build_with_nuitka=True" all
     # build operations (build, bdist_wheel, install etc) will run via Nuitka.
     # pylint: disable=unused-argument
+    # spell-checker: ignore cmdclass
 
     if not value:
         return
@@ -226,6 +218,9 @@ class build(distutils.command.build.build):
 
     @staticmethod
     def _parseOptionsEntry(option, value):
+        if option == "build_with_nuitka":
+            return
+
         option = "--" + option.lstrip("-")
 
         if type(value) is tuple and len(value) == 2 and value[0] == "setup.py":
@@ -244,7 +239,8 @@ class build(distutils.command.build.build):
             yield "%s=%s" % (option, value)
 
     def _build(self, build_lib):
-        # High complexity, pylint: disable=too-many-branches,too-many-locals
+        # High complexity,
+        # pylint: disable=too-many-branches,too-many-locals,too-many-statements
 
         old_dir = os.getcwd()
 
@@ -262,6 +258,8 @@ class build(distutils.command.build.build):
         # Search in the build directory preferably.
         addMainScriptDirectory(main_package_dir)
 
+        embedded_data_files = set()
+
         for is_package, module_name in self._findBuildTasks():
             # Nuitka wants the main package by filename, probably we should stop
             # needing that.
@@ -289,7 +287,12 @@ class build(distutils.command.build.build):
                 "--enable-plugin=pylint-warnings",
                 "--output-dir=%s" % output_dir,
                 "--nofollow-import-to=*.tests",
+                "--nowarn-mnemonic=compiled-package-hidden-by-package",
                 "--remove-output",
+                # Note: For when we are debugging module mode of Nuitka, not for general use.
+                # "--debug",
+                # "--trace",
+                # "--python-flag=-v"
             ]
 
             if package_name is not None:
@@ -306,13 +309,17 @@ class build(distutils.command.build.build):
             else:
                 command.append("--include-module=%s" % include_package_name)
 
-            toml_filename = os.environ.get("NUITKA_TOML_FILE")
+            toml_filename = os.getenv("NUITKA_TOML_FILE")
             if toml_filename:
                 # Import toml parser like "build" module does.
-                try:
-                    from tomli import loads as toml_loads
-                except ImportError:
-                    from toml import loads as toml_loads
+                if python_version >= 0x3B0:
+                    # stdlib only for 3.11, pylint: disable=I0021,import-error
+                    from tomllib import loads as toml_loads
+                else:
+                    try:
+                        from tomli import loads as toml_loads
+                    except ImportError:
+                        from toml import loads as toml_loads
 
                 # Cannot use FileOperations.getFileContents() here, because of non-Nuitka process
                 # pylint: disable=unspecified-encoding
@@ -323,12 +330,30 @@ class build(distutils.command.build.build):
                 for option, value in toml_options.get("nuitka", {}).items():
                     command.extend(self._parseOptionsEntry(option, value))
 
+                for option, value in (
+                    toml_options.get("tool", {}).get("nuitka", {}).items()
+                ):
+                    command.extend(self._parseOptionsEntry(option, value))
+
+            report_filename = None
+
             # Process any extra options from setuptools
             if "nuitka" in self.distribution.command_options:
                 for option, value in self.distribution.command_options[
                     "nuitka"
                 ].items():
-                    command.extend(self._parseOptionsEntry(option, value))
+                    for option in self._parseOptionsEntry(option, value):
+                        command.append(option)
+
+                        if option.startswith("--report="):
+                            report_filename = option.split("=", 1)[1]
+
+            if report_filename is None:
+                command.append("--report=compilation-report.xml")
+                report_filename = "compilation-report.xml"
+                delete_report = True
+            else:
+                delete_report = False
 
             command.append(main_filename)
 
@@ -341,17 +366,26 @@ class build(distutils.command.build.build):
                 "Finished compilation of '%s'." % module_name.asString(), style="green"
             )
 
-        self.build_lib = build_lib
+            report = parseCompilationReport(report_filename)
 
-        os.chdir(old_dir)
+            embedded_data_files.update(getEmbeddedDataFilenames(report))
+
+            if delete_report:
+                os.unlink(report_filename)
+
+        self.build_lib = build_lib
 
         # Remove Python code from build folder, that's our job now.
-        for root, _, filenames in os.walk(build_lib):
-            for filename in filenames:
-                fullpath = os.path.join(root, filename)
+        for filename in getFileList(
+            build_lib, only_suffixes=(".py", ".pyw", ".pyc", ".pyo")
+        ):
+            os.unlink(filename)
 
-                if fullpath.lower().endswith((".py", ".pyw", ".pyc", ".pyo")):
-                    os.unlink(fullpath)
+        # Remove data files from build folder, that's our job now too
+        for filename in embedded_data_files:
+            os.unlink(filename)
+
+        os.chdir(old_dir)
 
 
 # Required by distutils, used as command name, pylint: disable=invalid-name
@@ -359,7 +393,8 @@ class install(distutils.command.install.install):
     # pylint: disable=attribute-defined-outside-init
     def finalize_options(self):
         distutils.command.install.install.finalize_options(self)
-        # Ensure the purelib folder is not used
+        # Ensure the "purelib" folder is not used
+        # spell-checker: ignore purelib,platlib
         self.install_lib = self.install_platlib
 
 
@@ -379,8 +414,8 @@ class bdist_nuitka(wheel.bdist_wheel.bdist_wheel):
         wheel.bdist_wheel.bdist_wheel.finalize_options(self)
         # Force module to use correct platform in name
         self.root_is_pure = False
-        self.plat_name_supplied = self.plat_name is not None
 
+    # virtual method name, spell-checker: ignore wheelfile
     def write_wheelfile(self, wheelfile_base, generator=None):
         if generator is None:
             from nuitka.Version import getNuitkaVersion
@@ -390,3 +425,19 @@ class bdist_nuitka(wheel.bdist_wheel.bdist_wheel):
         wheel.bdist_wheel.bdist_wheel.write_wheelfile(
             self, wheelfile_base=wheelfile_base, generator=generator
         )
+
+
+#     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/distutils/__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/finalizations/Finalization.py

@@ -1,5 +1,24 @@
-#     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
+
+
+""" Finalizations. Last steps directly before code creation is called.
+
+Here the final tasks are executed. Things normally volatile during optimization
+can be computed here, so the code generation can be quick and doesn't have to
+check it many times.
+
+"""
+
+from nuitka.tree import Operations
+
+from .FinalizeMarkups import FinalizeMarkups
+
+
+def prepareCodeGeneration(module):
+    visitor = FinalizeMarkups(module)
+    Operations.visitTree(module, visitor)
+
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #
@@ -14,19 +33,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.
-#
-""" Finalizations. Last steps directly before code creation is called.
-
-Here the final tasks are executed. Things normally volatile during optimization
-can be computed here, so the code generation can be quick and doesn't have to
-check it many times.
-
-"""
-from nuitka.tree import Operations
-
-from .FinalizeMarkups import FinalizeMarkups
-
-
-def prepareCodeGeneration(tree):
-    visitor = FinalizeMarkups()
-    Operations.visitTree(tree, visitor)

nuitka/finalizations/FinalizeMarkups.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
+
+
 """ Finalize the markups
 
 Set flags on functions and classes to indicate if a locals dict is really
@@ -31,21 +17,15 @@ are in another context.
 
 """
 
-
 from nuitka import Tracing
-from nuitka.__past__ import unicode
-from nuitka.containers.OrderedSets import OrderedSet
 from nuitka.PythonVersions import python_version
 from nuitka.tree.Operations import VisitorNoopMixin
 
-imported_names = OrderedSet()
-
-
-def getImportedNames():
-    return imported_names
-
 
 class FinalizeMarkups(VisitorNoopMixin):
+    def __init__(self, module):
+        self.module = module
+
     def onEnterNode(self, node):
         try:
             self._onEnterNode(node)
@@ -60,36 +40,17 @@ class FinalizeMarkups(VisitorNoopMixin):
         # This has many different things it deals with, so there need to be a
         # lot of branches and statements, pylint: disable=too-many-branches
 
-        # Also all self specific things have been done on the outside,
-        # pylint: disable=no-self-use
         if node.isStatementReturn() or node.isStatementGeneratorReturn():
-            search = node
-
-            in_tried_block = False
-
             # Search up to the containing function, and check for a try/finally
             # containing the "return" statement.
-            search = search.getParentReturnConsumer()
+            search = node.getParentReturnConsumer()
 
             if (
                 search.isExpressionGeneratorObjectBody()
                 or search.isExpressionCoroutineObjectBody()
                 or search.isExpressionAsyncgenObjectBody()
             ):
-                if in_tried_block:
-                    search.markAsNeedsGeneratorReturnHandling(2)
-                else:
-                    search.markAsNeedsGeneratorReturnHandling(1)
-
-        if node.isExpressionBuiltinImport() and node.follow_attempted:
-            module_name = node.subnode_name
-
-            if module_name.isCompileTimeConstant():
-                imported_module_name = module_name.getCompileTimeConstant()
-
-                if type(imported_module_name) in (str, unicode):
-                    if imported_module_name:
-                        imported_names.add(imported_module_name)
+                search.markAsNeedsGeneratorReturnHandling()
 
         if node.isExpressionFunctionCreation():
             if (
@@ -105,11 +66,10 @@ class FinalizeMarkups(VisitorNoopMixin):
             function_body = node.getFunctionBody()
             parent_module = function_body.getParentModule()
 
-            node_module = node.getParentModule()
-            if node_module is not parent_module:
+            if self.module is not parent_module:
                 function_body.markAsCrossModuleUsed()
 
-                node_module.addCrossUsedFunction(function_body)
+                self.module.addCrossUsedFunction(function_body)
 
         if node.isStatementAssignmentVariable():
             target_var = node.getVariable()
@@ -118,10 +78,7 @@ class FinalizeMarkups(VisitorNoopMixin):
             if assign_source.isExpressionOperationBinary():
                 left_arg = assign_source.subnode_left
 
-                if (
-                    left_arg.isExpressionVariableRef()
-                    or left_arg.isExpressionTempVariableRef()
-                ):
+                if left_arg.isExpressionVariableRefOrTempVariableRef():
                     if assign_source.subnode_left.getVariable() is target_var:
                         if assign_source.isInplaceSuspect():
                             node.markAsInplaceSuspect()
@@ -129,6 +86,9 @@ class FinalizeMarkups(VisitorNoopMixin):
                     # TODO: This might be bad.
                     assign_source.removeMarkAsInplaceSuspect()
 
+            if target_var.isModuleVariable():
+                pass
+
         if python_version < 0x300 and node.isStatementPublishException():
             node.getParentStatementsFrame().markAsFrameExceptionPreserving()
 
@@ -136,7 +96,7 @@ class FinalizeMarkups(VisitorNoopMixin):
             if (
                 node.isExpressionYield()
                 or node.isExpressionYieldFrom()
-                or node.isExpressionYieldFromWaitable()
+                or node.isExpressionYieldFromAwaitable()
             ):
                 search = node.getParent()
 
@@ -158,3 +118,19 @@ class FinalizeMarkups(VisitorNoopMixin):
                     ):
                         node.markAsExceptionPreserving()
                         break
+
+
+#     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/finalizations/__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/freezer/DependsExe.py

@@ -1,28 +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
+
+
 """ Interface to depends.exe on Windows.
 
-We use depends.exe to investigate needed DLLs of Python DLLs.
+We use "depends.exe" to investigate needed DLLs of Python DLLs.
 
 """
 
 import os
 
+# pylint: disable=I0021,import-error,redefined-builtin
+from nuitka.__past__ import WindowsError
 from nuitka.containers.OrderedSets import OrderedSet
 from nuitka.Options import assumeYesForDownloads
 from nuitka.Tracing import inclusion_logger
@@ -32,7 +20,10 @@ from nuitka.utils.FileOperations import (
     deleteFile,
     getExternalUsePath,
     getFileContentByLine,
+    getNormalizedPath,
+    getWindowsLongPathName,
     isFilenameBelowPath,
+    isFilesystemEncodable,
     putTextFileContents,
     withFileLock,
 )
@@ -52,9 +43,11 @@ def getDependsExePath():
         depends_url = "https://dependencywalker.com/depends22_x64.zip"
 
     return getCachedDownload(
+        name="dependency walker",
         url=depends_url,
         is_arch_specific=getArchitecture(),
         binary="depends.exe",
+        unzip=True,
         flatten=True,
         specificity="",  # Note: If there ever was an update, put version here.
         message="""\
@@ -75,6 +68,7 @@ def _attemptToFindNotFoundDLL(dll_filename):
     if dll_filename in currently_loaded_dlls:
         return currently_loaded_dlls[dll_filename]
 
+    # Lets try the Windows system, spell-checker: ignore systemroot
     dll_filename = os.path.join(
         os.environ["SYSTEMROOT"],
         "SysWOW64" if getArchitecture() == "x86_64" else "System32",
@@ -135,25 +129,40 @@ def _parseDependsExeOutput2(lines):
             else:
                 continue
 
-        assert os.path.basename(dll_filename) != "kernel32.dll"
+        # The executable itself is of course exempted. We cannot check its path
+        # because depends.exe mistreats unicode paths.
+        if first:
+            first = False
+            continue
 
         dll_filename = os.path.abspath(dll_filename)
 
+        # Ignore errors trying to resolve the filename. Sometimes Chinese
+        # directory paths do not resolve to long filenames.
+        try:
+            dll_filename = getWindowsLongPathName(dll_filename)
+        except WindowsError:
+            pass
+
         dll_name = os.path.basename(dll_filename)
 
         # Ignore this runtime DLL of Python2, will be coming via manifest.
+        # spell-checker: ignore msvcr90
         if dll_name in ("msvcr90.dll",):
             continue
 
-        # The executable itself is of course exempted. We cannot check its path
-        # because depends.exe mistreats unicode paths.
-        if first:
-            first = False
+        # Ignore API DLLs, they can come in from PATH, but we do not want to
+        # include them.
+        if dll_name.startswith("api-ms-win-"):
+            continue
+
+        # Ignore UCRT runtime, this must come from OS, spell-checker: ignore ucrtbase
+        if dll_name == "ucrtbase.dll":
             continue
 
         assert os.path.isfile(dll_filename), (dll_filename, line)
 
-        result.add(os.path.normcase(os.path.abspath(dll_filename)))
+        result.add(getNormalizedPath(os.path.normcase(dll_filename)))
 
     return result
 
@@ -163,10 +172,14 @@ def parseDependsExeOutput(filename):
 
 
 def detectDLLsWithDependencyWalker(binary_filename, source_dir, scan_dirs):
-    dwp_filename = os.path.join(source_dir, os.path.basename(binary_filename) + ".dwp")
-    output_filename = os.path.join(
-        source_dir, os.path.basename(binary_filename) + ".depends"
-    )
+    source_dir = getExternalUsePath(source_dir)
+    temp_base_name = os.path.basename(binary_filename)
+
+    if not isFilesystemEncodable(temp_base_name):
+        temp_base_name = "dependency_walker"
+
+    dwp_filename = os.path.join(source_dir, temp_base_name + ".dwp")
+    output_filename = os.path.join(source_dir, temp_base_name + ".depends")
 
     # User query should only happen once if at all.
     with withFileLock(
@@ -204,14 +217,15 @@ SxS
                 "-f1",
                 "-pa1",
                 "-ps1",
-                binary_filename,
+                getExternalUsePath(binary_filename),
             ),
             external_cwd=True,
         )
 
     if not os.path.exists(output_filename):
         inclusion_logger.sysexit(
-            "Error, 'depends.exe' failed to produce expected output."
+            "Error, 'depends.exe' failed to produce expected output for binary '%s'."
+            % binary_filename
         )
 
     # Opening the result under lock, so it is not getting locked by new processes.
@@ -224,3 +238,19 @@ SxS
     deleteFile(dwp_filename, must_exist=True)
 
     return result
+
+
+#     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.