Nuitka-winsvc 2.5.6__cp311-cp311-win_amd64.whl → 2.6__cp311-cp311-win_amd64.whl

nuitka/tree/ReformulationFunctionStatements.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Reformulation of function statements.

nuitka/tree/ReformulationImportStatements.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Reformulation of import statements.

nuitka/tree/ReformulationLambdaExpressions.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Reformulation of lambda expressions.
@@ -148,6 +148,7 @@ def buildLambdaNode(provider, node, source_ref):
     body = frame_class(
         statements=mergeStatements((body,)),
         code_object=code_object,
+        owner_code_name=code_body.getCodeName(),
         source_ref=body.getSourceReference(),
     )
 

nuitka/tree/ReformulationMatchStatements.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Reformulation of Python3.10 match statements.

nuitka/tree/ReformulationMultidist.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Multidist re-formulation. """

nuitka/tree/ReformulationNamespacePackages.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """

nuitka/tree/ReformulationPrintStatements.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Reformulation of print statements.

nuitka/tree/ReformulationSequenceCreation.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Reformulation of sequence creations.

nuitka/tree/ReformulationSubscriptExpressions.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Reformulation of subscript into slicing.

nuitka/tree/ReformulationTryExceptStatements.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Reformulation of try/except statements.

nuitka/tree/ReformulationTryFinallyStatements.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Reformulation of try/finally statements.

nuitka/tree/ReformulationWhileLoopStatements.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Reformulation of while loop statements.

nuitka/tree/ReformulationWithStatements.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Reformulation of with statements.

nuitka/tree/ReformulationYieldExpressions.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Reformulation of "yield" and "yield from" expressions.

nuitka/tree/SourceHandling.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Read/write source code from files.

nuitka/tree/SyntaxErrors.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Handling of syntax errors.

nuitka/tree/TreeHelpers.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Helper functions for parsing the AST nodes and building the Nuitka node tree.
@@ -431,18 +431,18 @@ def makeModuleFrame(module, statements, source_ref):
     assert module.isCompiledPythonModule()
 
     if Options.is_full_compat:
-        code_name = "<module>"
+        co_name = "<module>"
     else:
         if module.isMainModule():
-            code_name = "<module>"
+            co_name = "<module>"
         else:
-            code_name = "<module %s>" % module.getFullName()
+            co_name = "<module %s>" % module.getFullName()
 
     return StatementsFrameModule(
         statements=tuple(statements),
         code_object=CodeObjectSpec(
-            co_name=code_name,
-            co_qualname=code_name,
+            co_name=co_name,
+            co_qualname=co_name,
             co_kind="Module",
             co_varnames=(),
             co_freevars=(),
@@ -455,6 +455,7 @@ def makeModuleFrame(module, statements, source_ref):
             co_lineno=source_ref.getLineNumber(),
             future_spec=module.getFutureSpec(),
         ),
+        owner_code_name=module.getCodeName(),
         source_ref=source_ref,
     )
 
@@ -497,26 +498,39 @@ def buildFrameNode(provider, nodes, code_object, source_ref):
 
     if provider.isExpressionFunctionBody():
         result = StatementsFrameFunction(
-            statements=statements, code_object=code_object, source_ref=source_ref
+            statements=statements,
+            code_object=code_object,
+            owner_code_name=provider.getCodeName(),
+            source_ref=source_ref,
         )
     elif provider.isExpressionClassBodyBase():
         result = StatementsFrameClass(
             statements=statements,
             code_object=code_object,
+            owner_code_name=provider.getCodeName(),
             locals_scope=provider.getLocalsScope(),
             source_ref=source_ref,
         )
     elif provider.isExpressionGeneratorObjectBody():
         result = StatementsFrameGenerator(
-            statements=statements, code_object=code_object, source_ref=source_ref
+            statements=statements,
+            code_object=code_object,
+            owner_code_name=provider.getCodeName(),
+            source_ref=source_ref,
         )
     elif provider.isExpressionCoroutineObjectBody():
         result = StatementsFrameCoroutine(
-            statements=statements, code_object=code_object, source_ref=source_ref
+            statements=statements,
+            code_object=code_object,
+            owner_code_name=provider.getCodeName(),
+            source_ref=source_ref,
         )
     elif provider.isExpressionAsyncgenObjectBody():
         result = StatementsFrameAsyncgen(
-            statements=statements, code_object=code_object, source_ref=source_ref
+            statements=statements,
+            code_object=code_object,
+            owner_code_name=provider.getCodeName(),
+            source_ref=source_ref,
         )
     else:
         assert False, provider

nuitka/tree/VariableClosure.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Variable closure taking.

nuitka/tree/__init__.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Dummy file to make this directory a package. """

nuitka/utils/AppDirs.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Wrapper around appdirs from PyPI
@@ -24,7 +24,10 @@ from .Importing import importFromInlineCopy
 appdirs = importFromInlineCopy("appdirs", must_exist=False, delete_module=True)
 
 if appdirs is None:
-    import appdirs  # pylint: disable=I0021,import-error
+    try:
+        import appdirs  # pylint: disable=I0021,import-error
+    except ImportError:
+        appdirs = None
 
 
 def getAppdirsModule():

nuitka/utils/CStrings.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ C string encoding

nuitka/utils/CommandLineOptions.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Tools for command line options."""
@@ -42,7 +42,7 @@ class OurOptionGroup(OptionGroup):
         require_compiling = kwargs.pop("require_compiling", True)
         github_action = kwargs.pop("github_action", True)
         github_action_default = kwargs.pop("github_action_default", None)
-        link = kwargs.pop("github_action_default", None)
+        link = kwargs.pop("link", None)
 
         result = OptionGroup.add_option(self, *args, **kwargs)
 

nuitka/utils/Distributions.py

@@ -1,9 +1,12 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Tools for accessing distributions and resolving package names for them. """
 
+import base64
+import hashlib
 import os
+import sys
 
 from nuitka.__past__ import (  # pylint: disable=redefined-builtin
     FileNotFoundError,
@@ -17,16 +20,59 @@ from nuitka.PythonFlavors import (
     isMSYS2MingwPython,
     isPosixWindows,
 )
-from nuitka.PythonVersions import python_version
+from nuitka.PythonVersions import python_version, python_version_str
 from nuitka.Tracing import metadata_logger
 
-from .FileOperations import searchPrefixPath
+from .FileOperations import (
+    getFileContentByLine,
+    getFileList,
+    isFilenameBelowPath,
+    searchPrefixPath,
+)
 from .Importing import getModuleNameAndKindFromFilenameSuffix
+from .Json import loadJsonFromFilename
 from .ModuleNames import ModuleName, checkModuleName
 from .Utils import isMacOS, isWin32Windows
 
 _package_to_distribution = None
 
+_conda_package_infos = None
+
+
+def _getCondaMetaDataFiles(distribution_name):
+    # Cached result, pylint: disable=global-statement
+    global _conda_package_infos
+
+    if _conda_package_infos is None:
+        _conda_package_infos = {}
+
+        conda_meta_dir = os.path.join(sys.prefix, "conda-meta")
+
+        for filename in getFileList(conda_meta_dir, only_suffixes=".json"):
+            conda_data = loadJsonFromFilename(filename)
+
+            if conda_data is not None:
+                for contained_filename in conda_data["files"]:
+                    if contained_filename.endswith(".dist-info/METADATA"):
+                        contained_filename_full = os.path.join(
+                            sys.prefix, contained_filename
+                        )
+                        if os.path.exists(contained_filename_full):
+                            for line in getFileContentByLine(
+                                contained_filename_full, encoding="utf8"
+                            ):
+                                if line.startswith("Name:"):
+                                    contained_distribution_name = line.split(" ", 1)[1]
+                                    _conda_package_infos[
+                                        contained_distribution_name
+                                    ] = conda_data
+                                    break
+
+    if distribution_name in _conda_package_infos:
+        return _conda_package_infos[distribution_name]["files"]
+    else:
+        return ()
+
 
 def getDistributionFiles(distribution):
     try:
@@ -40,8 +86,8 @@ is typically caused by corruption of its installation."""
         )
         hasattr_files = False
 
-    if hasattr_files:
-        for filename in distribution.files or ():
+    if hasattr_files and distribution.files is not None:
+        for filename in distribution.files:
             filename = filename.as_posix()
 
             yield filename
@@ -49,10 +95,73 @@ is typically caused by corruption of its installation."""
         record_data = _getDistributionMetadataFileContents(distribution, "RECORD")
 
         if record_data is not None:
-            for line in record_data.splitlines():
-                filename = line.split(",", 1)[0]
+            for record in _getDistributionMetadataRecordData(distribution):
+                yield record[0]
+        else:
+            if isAnacondaPython():
+                # On different OSes, different Python versions, different
+                # prefixes are used by Anaconda.
+                candidate_prefixes = (
+                    "lib/site-packages/",
+                    "lib/python%s/site-packages/" % python_version_str,
+                )
+
+                for filename in _getCondaMetaDataFiles(
+                    distribution_name=getDistributionName(distribution)
+                ):
+                    for candidate_prefix in candidate_prefixes:
+                        if filename.lower().startswith(candidate_prefix):
+                            yield filename[len(candidate_prefix) :]
+                            break
+
+
+def _getDistributionMetadataRecordData(distribution):
+    record_data = _getDistributionMetadataFileContents(distribution, "RECORD")
+
+    for line in record_data.splitlines():
+        yield line.split(",")
+
+
+def _readChunks(file_handle):
+    while True:
+        chunk = file_handle.read(1 << 20)
+        if not chunk:
+            break
+        yield chunk
+
+
+def _makeRecordData(filename):
+    h = hashlib.sha256()
+    length = 0
+    with open(filename, "rb") as file_handle:
+        for block in _readChunks(file_handle):
+            length += len(block)
+            h.update(block)
+    digest = "sha256=" + base64.urlsafe_b64encode(h.digest()).decode("latin1").rstrip(
+        "="
+    )
+
+    return digest, str(length)
+
+
+def checkDistributionMetadataRecord(package_dir, distribution):
+    problems = 0
+    ok = 0
+
+    for record in _getDistributionMetadataRecordData(distribution):
+        filename = os.path.join(package_dir, "..", record[0])
+
+        if not isFilenameBelowPath(path=package_dir, filename=filename):
+            continue
+
+        checksum, size = _makeRecordData(filename)
+
+        if checksum != record[1] or size != record[2]:
+            problems += 1
+        else:
+            ok += 1
 
-                yield filename
+    return ok, problems
 
 
 def _getDistributionMetadataFileContents(distribution, filename):
@@ -76,10 +185,14 @@ is typically caused by corruption of its installation."""
 
 
 def _getDistributionInstallerFileContents(distribution):
-    installer_name = _getDistributionMetadataFileContents(distribution, "INSTALLER")
+    installer_file_contents = _getDistributionMetadataFileContents(
+        distribution, "INSTALLER"
+    )
 
-    if installer_name:
-        installer_name = installer_name.strip().lower()
+    if installer_file_contents:
+        installer_name = installer_file_contents.strip().lower()
+    else:
+        installer_name = None
 
     return installer_name
 
@@ -101,7 +214,7 @@ def getDistributionTopLevelPackageNames(distribution):
 
             first_path_element, _, remainder = filename.partition("/")
 
-            if first_path_element.endswith("dist-info"):
+            if first_path_element.endswith((".dist-info", ".egg-info")):
                 continue
             if first_path_element == "__pycache__":
                 continue
@@ -227,8 +340,8 @@ def getDistributionsFromModuleName(module_name):
     """
 
     # Cached result, pylint: disable=global-statement
-
     global _package_to_distribution
+
     if _package_to_distribution is None:
         _package_to_distribution = _initPackageToDistributionName()
 
@@ -249,16 +362,65 @@ def getDistributionsFromModuleName(module_name):
     )
 
 
-def getDistributionFromModuleName(module_name):
+def _getDistributionFromModuleName(module_name, prefer_shorter_distribution_name):
     """Get the distribution name associated with a module name."""
+
     distributions = getDistributionsFromModuleName(module_name)
 
     if not distributions:
         return None
     elif len(distributions) == 1:
         return distributions[0]
+    elif prefer_shorter_distribution_name:
+
+        def sortDist(dist):
+            return len(getDistributionName(dist))
+
+        return min(distributions, key=sortDist)
     else:
-        return min(distributions, key=lambda dist: len(getDistributionName(dist)))
+        # Cyclic dependency here.
+        from nuitka.importing.Importing import locateModule
+
+        _used_module_name, filename, _module_kind, _finding = locateModule(
+            module_name=module_name,
+            parent_package=None,
+            level=0,
+        )
+
+        # Sometimes competing distributions are installed. In that case we try
+        # and guess which one is the most correct here by compare the records
+        # if they are available and otherwise just picking the shortest name.
+        check_data = dict(
+            (dist, checkDistributionMetadataRecord(filename, dist))
+            for dist in distributions
+        )
+
+        if all(d[0] == 0 for d in check_data.values()):
+
+            def sortDist(dist):
+                return len(getDistributionName(dist))
+
+        else:
+
+            def sortDist(dist):
+                return check_data[dist][1]
+
+        return min(distributions, key=sortDist)
+
+
+_distribution_from_name_cache = {}
+
+
+def getDistributionFromModuleName(module_name, prefer_shorter_distribution_name=False):
+    """Get the distribution name associated with a module name."""
+
+    if module_name not in _distribution_from_name_cache:
+        _distribution_from_name_cache[module_name] = _getDistributionFromModuleName(
+            module_name=module_name,
+            prefer_shorter_distribution_name=prefer_shorter_distribution_name,
+        )
+
+    return _distribution_from_name_cache[module_name]
 
 
 def getDistribution(distribution_name):

nuitka/utils/Download.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Download utilities and extract locally when allowed.
@@ -16,6 +16,7 @@ from .AppDirs import getCacheDir
 from .FileOperations import (
     addFileExecutablePermission,
     deleteFile,
+    getNormalizedPath,
     makePath,
     queryUser,
 )
@@ -59,9 +60,10 @@ def getCachedDownload(
     message,
     reject,
     assume_yes_for_downloads,
+    download_ok,
 ):
     # Many branches to deal with.
-    # pylint: disable=too-many-branches,too-many-locals
+    # pylint: disable=too-many-branches,too-many-locals,too-many-statements
 
     nuitka_download_dir = getDownloadCacheDir()
 
@@ -81,7 +83,9 @@ def getCachedDownload(
     makePath(nuitka_download_dir)
 
     if not os.path.isfile(download_path) and not os.path.isfile(exe_path):
-        if assume_yes_for_downloads:
+        if not download_ok:
+            reply = "no"
+        elif assume_yes_for_downloads:
             reply = "yes"
         else:
             reply = queryUser(
@@ -99,6 +103,9 @@ Fully automatic, cached. Proceed and download"""
 
         if reply != "yes":
             if reject is not None:
+                if not download_ok:
+                    reject += " Make sure to allow downloading it when prompted."
+
                 Tracing.general.sysexit(reject)
         else:
             Tracing.general.info("Downloading '%s'." % url)
@@ -158,12 +165,12 @@ Fully automatic, cached. Proceed and download"""
 
             exe_path = None
 
-        return exe_path
+        return getNormalizedPath(exe_path)
     else:
-        return download_path
+        return getNormalizedPath(download_path)
 
 
-def getCachedDownloadedMinGW64(target_arch, assume_yes_for_downloads):
+def getCachedDownloadedMinGW64(target_arch, assume_yes_for_downloads, download_ok):
     # Large URLs, pylint: disable=line-too-long
 
     if target_arch == "x86_64":
@@ -188,6 +195,7 @@ def getCachedDownloadedMinGW64(target_arch, assume_yes_for_downloads):
         message="Nuitka will use gcc from MinGW64 of winlibs to compile on Windows.",
         reject="Only this specific gcc is supported with Nuitka.",
         assume_yes_for_downloads=assume_yes_for_downloads,
+        download_ok=download_ok,
     )
 
     return gcc_binary