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

nuitka/tree/ReformulationDictionaryCreation.py

@@ -87,7 +87,7 @@ def buildDictionaryNode(provider, node, source_ref):
 
 
 @once_decorator
-def getDictUnpackingHelper():
+def _getDictUnpackingHelper():
     helper_name = "_unpack_dict"
 
     result = makeInternalHelperFunctionBody(
@@ -272,7 +272,7 @@ def buildDictionaryUnpacking(provider, keys, values, source_ref):
     result = makeExpressionFunctionCall(
         function=makeExpressionFunctionCreation(
             function_ref=ExpressionFunctionRef(
-                function_body=getDictUnpackingHelper(), source_ref=source_ref
+                function_body=_getDictUnpackingHelper(), source_ref=source_ref
             ),
             defaults=(),
             kw_defaults=None,

nuitka/tree/ReformulationFunctionStatements.py

@@ -54,8 +54,8 @@ from nuitka.plugins.Plugins import Plugins, hasActivePlugin
 from nuitka.PythonVersions import python_version
 from nuitka.specs.ParameterSpecs import ParameterSpec
 
+from .FutureSpecState import getFutureSpec
 from .ReformulationExecStatements import wrapEvalGlobalsAndLocals
-from .ReformulationImportStatements import getFutureSpec
 from .ReformulationTryFinallyStatements import (
     makeTryFinallyReleaseStatement,
     makeTryFinallyStatement,

nuitka/tree/ReformulationImportStatements.py

@@ -12,7 +12,6 @@ source code comments with Developer Manual sections.
 
 from nuitka.importing.ImportResolving import resolveModuleName
 from nuitka.nodes.ConstantRefNodes import makeConstantRefNode
-from nuitka.nodes.FutureSpecs import FutureSpec
 from nuitka.nodes.GlobalsLocalsNodes import ExpressionBuiltinGlobals
 from nuitka.nodes.ImportNodes import (
     ExpressionBuiltinImport,
@@ -25,10 +24,10 @@ from nuitka.nodes.StatementNodes import StatementsSequence
 from nuitka.nodes.VariableAssignNodes import makeStatementAssignmentVariable
 from nuitka.nodes.VariableNameNodes import StatementAssignmentVariableName
 from nuitka.nodes.VariableRefNodes import ExpressionTempVariableRef
-from nuitka.plugins.Plugins import Plugins
 from nuitka.PythonVersions import python_version
 from nuitka.utils.ModuleNames import ModuleName
 
+from .FutureSpecState import enableFutureFeature, getFutureSpec
 from .ReformulationTryFinallyStatements import makeTryFinallyReleaseStatement
 from .SyntaxErrors import raiseSyntaxError
 from .TreeHelpers import makeStatementsSequenceOrStatement, mangleName
@@ -66,7 +65,7 @@ from __future__ imports must occur at the beginning of the file""",
     for import_desc in node.names:
         object_name, _local_name = import_desc.name, import_desc.asname
 
-        _enableFutureFeature(node=node, object_name=object_name, source_ref=source_ref)
+        enableFutureFeature(node=node, object_name=object_name, source_ref=source_ref)
 
     # Remember it for checks to be applied once module is complete, e.g. if
     # they are all at module start.
@@ -74,52 +73,6 @@ from __future__ imports must occur at the beginning of the file""",
     _future_import_nodes.append(node)
 
 
-_future_specs = []
-
-
-def pushFutureSpec(module_name):
-    _future_specs.append(
-        FutureSpec(use_annotations=Plugins.decideAnnotations(module_name))
-    )
-
-
-def getFutureSpec():
-    return _future_specs[-1]
-
-
-def popFutureSpec():
-    del _future_specs[-1]
-
-
-def _enableFutureFeature(node, object_name, source_ref):
-    future_spec = _future_specs[-1]
-
-    if object_name == "unicode_literals":
-        future_spec.enableUnicodeLiterals()
-    elif object_name == "absolute_import":
-        future_spec.enableAbsoluteImport()
-    elif object_name == "division":
-        future_spec.enableFutureDivision()
-    elif object_name == "print_function":
-        future_spec.enableFuturePrint()
-    elif object_name == "barry_as_FLUFL" and python_version >= 0x300:
-        future_spec.enableBarry()
-    elif object_name == "generator_stop":
-        future_spec.enableGeneratorStop()
-    elif object_name == "braces":
-        raiseSyntaxError("not a chance", source_ref.atColumnNumber(node.col_offset))
-    elif object_name in ("nested_scopes", "generators", "with_statement"):
-        # These are enabled in all cases already.
-        pass
-    elif object_name == "annotations" and python_version >= 0x370:
-        future_spec.enableFutureAnnotations()
-    else:
-        raiseSyntaxError(
-            "future feature %s is not defined" % object_name,
-            source_ref.atColumnNumber(node.col_offset),
-        )
-
-
 def _resolveImportModuleName(module_name):
     if module_name:
         module_name = resolveModuleName(ModuleName(module_name)).asString()
@@ -142,7 +95,7 @@ def buildImportFromNode(provider, node, source_ref):
     # Use default level under some circumstances.
     if level == -1:
         level = None
-    elif level == 0 and not _future_specs[-1].isAbsoluteImport():
+    elif level == 0 and not getFutureSpec().isAbsoluteImport():
         level = None
 
     if level is not None:
@@ -311,7 +264,7 @@ def buildImportModulesNode(provider, node, source_ref):
         # imports.
         level = (
             makeConstantRefNode(0, source_ref, True)
-            if _future_specs[-1].isAbsoluteImport()
+            if getFutureSpec().isAbsoluteImport()
             else None
         )
 

nuitka/tree/ReformulationMultidist.py

@@ -36,7 +36,7 @@ def createMultidistMainSourceCode():
     source_code = renderTemplateFromString(
         r"""
 import sys, re, os
-main_basename = re.sub(r'(.pyw?|\.exe|\.bin)?$', '', os.path.normcase(os.path.basename(sys.argv[0])))
+main_basename = re.sub(r'(.pyw?|\.exe|\.bin)?$', '', os.path.normcase(os.path.basename(__compiled__.original_argv0)))
 {% for main_module_name, main_basename in zip(main_module_names, main_basenames) %}
 if main_basename == "{{main_basename}}":
     __import__("{{main_module_name.asString()}}")

nuitka/tree/ReformulationNamespacePackages.py

@@ -28,7 +28,12 @@ from nuitka.nodes.VariableNameNodes import StatementAssignmentVariableName
 from nuitka.Options import getFileReferenceMode
 from nuitka.PythonVersions import python_version
 
-from .TreeHelpers import makeStatementsSequenceFromStatement
+from .FutureSpecState import popFutureSpec, pushFutureSpec
+from .TreeHelpers import (
+    buildNode,
+    makeStatementsSequenceFromStatement,
+    parseSourceCodeToAst,
+)
 from .VariableClosure import completeVariableClosures
 
 
@@ -51,7 +56,7 @@ def _makeCall(module_name, import_name, attribute_name, source_ref, *args):
     )
 
 
-def getNameSpacePathExpression(package, source_ref):
+def _getNameSpacePathExpression(package, source_ref):
     """Create the __path__ expression for a package."""
 
     reference_mode = getFileReferenceMode()
@@ -135,12 +140,29 @@ def createPathAssignment(package, source_ref):
     return StatementAssignmentVariableName(
         provider=package,
         variable_name="__path__",
-        source=getNameSpacePathExpression(package=package, source_ref=source_ref),
+        source=_getNameSpacePathExpression(package=package, source_ref=source_ref),
         source_ref=source_ref,
     )
 
 
+def _getPathFinderFunction(package, source_ref):
+    # TODO: This could be a shared helper function, but we currently cannot do these.
+    ast_tree = parseSourceCodeToAst(
+        source_code="_path_finder = lambda *args, **kw: None",
+        module_name=package.getFullName(),
+        filename=source_ref.getFilename(),
+        line_offset=0,
+    )
+
+    pushFutureSpec(package.getFullName())
+    statement = buildNode(package, ast_tree.body[0], source_ref)
+    popFutureSpec()
+
+    return statement.subnode_source
+
+
 def createPython3NamespacePath(package, source_ref):
+
     module_name = (
         "_frozen_importlib" if python_version < 0x350 else "_frozen_importlib_external"
     )
@@ -167,8 +189,8 @@ def createPython3NamespacePath(package, source_ref):
                         user_provided=True,
                         source_ref=source_ref,
                     ),
-                    getNameSpacePathExpression(package=package, source_ref=source_ref),
-                    makeConstantRefNode(constant=None, source_ref=source_ref),
+                    _getNameSpacePathExpression(package=package, source_ref=source_ref),
+                    _getPathFinderFunction(package=package, source_ref=source_ref),
                 ),
                 user_provided=True,
                 source_ref=source_ref,

nuitka/tree/SourceHandling.py

@@ -16,8 +16,9 @@ from nuitka.__past__ import unicode
 from nuitka.containers.OrderedSets import OrderedSet
 from nuitka.plugins.Plugins import Plugins
 from nuitka.PythonVersions import python_version, python_version_str
-from nuitka.Tracing import general, my_print
-from nuitka.utils.FileOperations import putTextFileContents
+from nuitka.Tracing import general, inclusion_logger, my_print
+from nuitka.utils.FileOperations import getReportPath, putTextFileContents
+from nuitka.utils.ModuleNames import ModuleName, checkModuleName
 from nuitka.utils.Shebang import getShebangFromSource, parseShebang
 from nuitka.utils.Utils import isWin32OrPosixWindows
 
@@ -310,7 +311,23 @@ def writeSourceCode(filename, source_code):
     putTextFileContents(filename=filename, contents=source_code, encoding="latin1")
 
 
-def parsePyIFile(module_name, pyi_filename):
+def _checkAndAddModuleName(pyi_deps, pyi_filename, line_number, candidate):
+    if type(candidate) is not ModuleName:
+        if (
+            not checkModuleName(candidate)
+            or candidate.startswith(" ")
+            or candidate.endswith(" ")
+        ):
+            inclusion_logger.warning(
+                "Encountered wrong '.pyi' parsing result in '%s:%d' giving illegal module name '%s'."
+                % (getReportPath(pyi_filename), line_number, candidate)
+            )
+            return None
+
+    pyi_deps.add(ModuleName(candidate))
+
+
+def parsePyIFile(module_name, package_name, pyi_filename):
     """Parse a pyi file for the given module name and extract imports made."""
 
     # Complex stuff, pylint: disable=too-many-branches,too-many-statements
@@ -329,7 +346,7 @@ def parsePyIFile(module_name, pyi_filename):
         source_filename=pyi_filename,
     )
 
-    for line in pyi_contents.splitlines():
+    for line_number, line in enumerate(pyi_contents.splitlines(), start=1):
         line = line.strip()
 
         if in_quote:
@@ -338,19 +355,22 @@ def parsePyIFile(module_name, pyi_filename):
 
             continue
 
-        if line.startswith('"""'):
+        if line.startswith('"""') and not line.endswith('"""'):
             in_quote = '"""'
             continue
 
-        if line.startswith("'''"):
+        if line.startswith("'''") and not line.endswith("'''"):
             in_quote = "'''"
             continue
 
         if not in_import:
             if line.startswith("import "):
-                imported = line[7:]
-
-                pyi_deps.add(imported)
+                _checkAndAddModuleName(
+                    pyi_deps=pyi_deps,
+                    pyi_filename=pyi_filename,
+                    line_number=line_number,
+                    candidate=line[7:].split("#", 1)[0].strip(),
+                )
             elif line.startswith("from "):
                 parts = line.split(None, 3)
                 assert parts[0] == "from"
@@ -364,7 +384,7 @@ def parsePyIFile(module_name, pyi_filename):
                     continue
 
                 if origin_name == ".":
-                    origin_name = module_name
+                    origin_name = package_name
                 else:
                     dot_count = 0
                     while origin_name.startswith("."):
@@ -373,18 +393,23 @@ def parsePyIFile(module_name, pyi_filename):
 
                     if dot_count > 0:
                         if origin_name:
-                            origin_name = module_name.getRelativePackageName(
+                            origin_name = package_name.getRelativePackageName(
                                 level=dot_count - 1
                             ).getChildNamed(origin_name)
                         else:
-                            origin_name = module_name.getRelativePackageName(
+                            origin_name = package_name.getRelativePackageName(
                                 level=dot_count - 1
                             )
 
                 if origin_name != module_name:
-                    pyi_deps.add(origin_name)
-
-                imported = parts[3]
+                    _checkAndAddModuleName(
+                        pyi_deps=pyi_deps,
+                        pyi_filename=pyi_filename,
+                        line_number=line_number,
+                        candidate=origin_name,
+                    )
+
+                imported = parts[3].split("#", 1)[0].strip()
                 if imported.startswith("("):
                     # Handle multiline imports
                     if not imported.endswith(")"):
@@ -405,7 +430,12 @@ def parsePyIFile(module_name, pyi_filename):
                 for name in imported.split(","):
                     if name:
                         name = name.strip()
-                        pyi_deps.add(origin_name + "." + name)
+                        _checkAndAddModuleName(
+                            pyi_deps=pyi_deps,
+                            pyi_filename=pyi_filename,
+                            line_number=line_number,
+                            candidate=origin_name + "." + name,
+                        )
 
         else:  # In import
             imported = line
@@ -416,7 +446,16 @@ def parsePyIFile(module_name, pyi_filename):
             for name in imported.split(","):
                 name = name.strip()
                 if name:
-                    pyi_deps.add(in_import_part + "." + name)
+                    _checkAndAddModuleName(
+                        pyi_deps=pyi_deps,
+                        pyi_filename=pyi_filename,
+                        line_number=line_number,
+                        candidate=in_import_part + "." + name,
+                    )
+
+    # Rejected module names have become None.
+    if None in pyi_deps:
+        pyi_deps.remove(None)
 
     return pyi_deps
 

nuitka/utils/Distributions.py

@@ -118,8 +118,9 @@ is typically caused by corruption of its installation."""
 def _getDistributionMetadataRecordData(distribution):
     record_data = _getDistributionMetadataFileContents(distribution, "RECORD")
 
-    for line in record_data.splitlines():
-        yield line.split(",")
+    if record_data is not None:
+        for line in record_data.splitlines():
+            yield line.split(",")
 
 
 def _readChunks(file_handle):
@@ -133,10 +134,15 @@ def _readChunks(file_handle):
 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)
+
+    try:
+        with open(filename, "rb") as file_handle:
+            for block in _readChunks(file_handle):
+                length += len(block)
+                h.update(block)
+    except IOError:
+        pass
+
     digest = "sha256=" + base64.urlsafe_b64encode(h.digest()).decode("latin1").rstrip(
         "="
     )
@@ -462,6 +468,20 @@ def isDistributionCondaPackage(distribution_name):
     return getDistributionInstallerName(distribution_name) == "conda"
 
 
+def isDistributionVendored(distribution_name):
+    # Only observed case with setuptools so far.
+    if getDistributionInstallerName(distribution_name) == "uv":
+        path = _getDistributionPath(getDistribution(distribution_name))
+
+        if path is not None:
+            if os.path.dirname(path).endswith(
+                (r"setuptools\_vendor", "setuptools/vendor")
+            ):
+                return True
+
+    return False
+
+
 def isDistributionMsys2Package(distribution_name):
     if not isAnacondaPython():
         return False

nuitka/utils/FileOperations.py

@@ -690,6 +690,12 @@ def changeFilenameExtension(path, extension):
     return os.path.splitext(path)[0] + extension
 
 
+def switchFilenameExtension(path, old_extension, new_extension):
+    """Switch the filename extension specified to another one."""
+    assert path.endswith(old_extension)
+    return path[: -len(old_extension)] + new_extension
+
+
 def hasFilenameExtension(path, extensions):
     """Has a filename one of the given extensions.
 
@@ -999,6 +1005,17 @@ def copyTree(source_path, dest_path):
         return copy_tree(source_path, dest_path)
 
 
+def resolveSymlink(path):
+    """Resolve a symlink, to a relative path."""
+    link_source_abs = os.path.abspath(path)
+    link_target_abs = os.path.abspath(
+        os.path.join(os.path.dirname(path), os.readlink(path))
+    )
+    link_target_rel = relpath(link_target_abs, os.path.dirname(link_source_abs))
+
+    return link_target_rel
+
+
 def copyFileWithPermissions(source_path, dest_path, dist_dir):
     """Improved version of shutil.copy2 for putting things to dist folder
 
@@ -1007,12 +1024,7 @@ def copyFileWithPermissions(source_path, dest_path, dist_dir):
     """
 
     if os.path.islink(source_path) and not isWin32Windows():
-        link_source_abs = os.path.abspath(source_path)
-        link_target_abs = os.path.abspath(
-            os.path.join(os.path.dirname(source_path), os.readlink(source_path))
-        )
-
-        link_target_rel = relpath(link_target_abs, os.path.dirname(link_source_abs))
+        link_target_rel = resolveSymlink(source_path)
 
         if isFilenameBelowPath(
             path=dist_dir,

nuitka/utils/StaticLibraries.py

@@ -14,6 +14,7 @@ from nuitka.PythonFlavors import (
     isNuitkaPython,
     isRyePython,
     isSelfCompiledPythonUninstalled,
+    isUvPython,
 )
 from nuitka.PythonVersions import (
     getPythonABI,
@@ -157,6 +158,9 @@ def _getSystemStaticLibPythonPath():
     if isMacOS() and isRyePython():
         return None
 
+    if isUvPython():
+        return None
+
     if isSelfCompiledPythonUninstalled():
         candidate = os.path.join(sys_prefix, "libpython" + python_abi_version + ".a")