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

nuitka/tree/ReformulationAssertStatements.py

@@ -11,7 +11,10 @@ source code comments with Developer Manual sections.
 from nuitka.nodes.BuiltinRefNodes import ExpressionBuiltinExceptionRef
 from nuitka.nodes.ConditionalNodes import makeStatementConditional
 from nuitka.nodes.ContainerMakingNodes import makeExpressionMakeTuple
-from nuitka.nodes.ExceptionNodes import StatementRaiseException
+from nuitka.nodes.ExceptionNodes import (
+    StatementRaiseException,
+    makeBuiltinMakeExceptionNode,
+)
 from nuitka.nodes.OperatorNodesUnary import ExpressionOperationNot
 from nuitka.Options import hasPythonFlagNoAsserts
 from nuitka.PythonVersions import python_version
@@ -39,20 +42,34 @@ def buildAssertNode(provider, node, source_ref):
     if hasPythonFlagNoAsserts():
         return None
 
-    if exception_value is not None and python_version >= 0x272:
-        exception_value = makeExpressionMakeTuple(
-            elements=(exception_value,), source_ref=source_ref
+    if python_version < 0x3C0:
+        if exception_value is not None and python_version >= 0x272:
+            exception_value = makeExpressionMakeTuple(
+                elements=(exception_value,), source_ref=source_ref
+            )
+
+        raise_statement = StatementRaiseException(
+            exception_type=ExpressionBuiltinExceptionRef(
+                exception_name="AssertionError", source_ref=source_ref
+            ),
+            exception_value=exception_value,
+            exception_trace=None,
+            exception_cause=None,
+            source_ref=source_ref,
+        )
+    else:
+        raise_statement = StatementRaiseException(
+            exception_type=makeBuiltinMakeExceptionNode(
+                exception_name="AssertionError",
+                args=(exception_value,) if exception_value else (),
+                for_raise=False,
+                source_ref=source_ref,
+            ),
+            exception_value=None,
+            exception_cause=None,
+            exception_trace=None,
+            source_ref=source_ref,
         )
-
-    raise_statement = StatementRaiseException(
-        exception_type=ExpressionBuiltinExceptionRef(
-            exception_name="AssertionError", source_ref=source_ref
-        ),
-        exception_value=exception_value,
-        exception_trace=None,
-        exception_cause=None,
-        source_ref=source_ref,
-    )
 
     return makeStatementConditional(
         condition=ExpressionOperationNot(

nuitka/tree/ReformulationAssignmentStatements.py

@@ -53,7 +53,7 @@ from nuitka.nodes.SubscriptNodes import (
     StatementAssignmentSubscript,
     StatementDelSubscript,
 )
-from nuitka.nodes.TypeNodes import ExpressionTypeAlias
+from nuitka.nodes.TypeNodes import ExpressionTypeAlias, ExpressionTypeVariable
 from nuitka.nodes.VariableAssignNodes import makeStatementAssignmentVariable
 from nuitka.nodes.VariableDelNodes import makeStatementDelVariable
 from nuitka.nodes.VariableNameNodes import (
@@ -1221,6 +1221,10 @@ def buildNamedExprNode(provider, node, source_ref):
     return outline_body
 
 
+def buildTypeVarNode(node, source_ref):
+    return ExpressionTypeVariable(node.name, source_ref=source_ref)
+
+
 def buildTypeAliasNode(provider, node, source_ref):
     """Python3.12 or higher, type alias statements."""
 

nuitka/tree/ReformulationClasses3.py

@@ -63,6 +63,7 @@ from nuitka.nodes.NodeMakingHelpers import (
     makeRaiseExceptionExpressionFromTemplate,
     mergeStatements,
 )
+from nuitka.nodes.OperatorNodes import makeBinaryOperationNode
 from nuitka.nodes.ReturnNodes import StatementReturn
 from nuitka.nodes.StatementNodes import StatementExpressionOnly
 from nuitka.nodes.SubscriptNodes import makeExpressionIndexLookup
@@ -70,9 +71,13 @@ from nuitka.nodes.TypeNodes import (
     ExpressionBuiltinType1,
     ExpressionSubtypeCheck,
     ExpressionTypeCheck,
+    ExpressionTypeMakeGeneric,
 )
 from nuitka.nodes.VariableAssignNodes import makeStatementAssignmentVariable
-from nuitka.nodes.VariableNameNodes import StatementAssignmentVariableName
+from nuitka.nodes.VariableNameNodes import (
+    ExpressionVariableNameRef,
+    StatementAssignmentVariableName,
+)
 from nuitka.nodes.VariableRefNodes import (
     ExpressionTempVariableRef,
     ExpressionVariableRef,
@@ -177,11 +182,36 @@ def buildClassNode3(provider, node, source_ref):
 
     # Only local variable, for provision to methods.
     class_variable = class_locals_scope.getLocalVariable(
-        owner=class_creation_function, variable_name="__class__"
+        owner=class_creation_function,
+        variable_name="__class__",
     )
 
     class_locals_scope.registerProvidedVariable(class_variable)
 
+    if python_version >= 0x3C0:
+        type_param_nodes = node.type_params
+    else:
+        type_param_nodes = None
+
+    if type_param_nodes is not None:
+        type_params_expressions = buildNodeTuple(
+            provider=provider, nodes=type_param_nodes, source_ref=source_ref
+        )
+    else:
+        type_params_expressions = ()
+
+    type_variables = []
+
+    for type_params_expression in type_params_expressions:
+        type_variable = class_locals_scope.getLocalVariable(
+            owner=class_creation_function,
+            variable_name=type_params_expression.name,
+        )
+
+        class_locals_scope.registerProvidedVariable(type_variable)
+
+        type_variables.append(type_variable)
+
     class_variable_ref = ExpressionVariableRef(
         variable=class_variable, source_ref=source_ref
     )
@@ -238,6 +268,35 @@ def buildClassNode3(provider, node, source_ref):
         ),
     ]
 
+    for type_variable, type_params_expression in zip(
+        type_variables, type_params_expressions
+    ):
+        statements.append(
+            makeStatementAssignmentVariable(
+                variable=type_variable,
+                source=type_params_expression,
+                source_ref=source_ref,
+            )
+        )
+
+    if type_params_expressions:
+        statements.append(
+            StatementAssignmentVariableName(
+                provider=class_creation_function,
+                variable_name="__type_params__",
+                source=makeExpressionMakeTuple(
+                    elements=tuple(
+                        ExpressionVariableRef(
+                            variable=type_variable, source_ref=source_ref
+                        )
+                        for type_variable in type_variables
+                    ),
+                    source_ref=source_ref,
+                ),
+                source_ref=source_ref,
+            )
+        )
+
     if class_doc is not None:
         statements.append(
             StatementAssignmentVariableName(
@@ -250,17 +309,10 @@ def buildClassNode3(provider, node, source_ref):
             )
         )
 
-    # The "__qualname__" attribute is new in Python3.
-    qualname = class_creation_function.getFunctionQualname()
-
-    if python_version < 0x340:
-        qualname_ref = makeConstantRefNode(
-            constant=qualname, source_ref=source_ref, user_provided=True
-        )
-    else:
-        qualname_ref = ExpressionFunctionQualnameRef(
-            function_body=class_creation_function, source_ref=source_ref
-        )
+    # The "__qualname__" attribute has a dedicated node.
+    qualname_ref = ExpressionFunctionQualnameRef(
+        function_body=class_creation_function, source_ref=source_ref
+    )
 
     statements.append(
         StatementLocalsDictOperationSet(
@@ -290,7 +342,9 @@ def buildClassNode3(provider, node, source_ref):
 
     needs_orig_bases = _needsOrigBases(static_qualname)
 
-    if node.bases:
+    has_bases = node.bases or type_params_expressions
+
+    if has_bases:
         tmp_bases = provider.allocateTempVariable(
             temp_scope=temp_scope, name="bases", temp_type="object"
         )
@@ -310,7 +364,7 @@ def buildClassNode3(provider, node, source_ref):
 
         needs_orig_bases = False
 
-    if node.bases and needs_orig_bases:
+    if has_bases and needs_orig_bases:
         statements.append(
             makeStatementConditional(
                 condition=makeComparisonExpression(
@@ -403,13 +457,33 @@ def buildClassNode3(provider, node, source_ref):
 
     statements = []
 
-    if node.bases:
+    if has_bases:
+        if node.bases:
+            bases_value = _buildBasesTupleCreationNode(
+                provider=provider, elements=node.bases, source_ref=source_ref
+            )
+
+            if type_params_expressions:
+                bases_value = makeBinaryOperationNode(
+                    operator="Add",
+                    left=bases_value,
+                    right=ExpressionTypeMakeGeneric(
+                        type_params=ExpressionVariableNameRef(
+                            provider=class_creation_function,
+                            variable_name="__type_params__",
+                            source_ref=source_ref,
+                        ),
+                        source_ref=source_ref,
+                    ),
+                    source_ref=source_ref,
+                )
+        else:
+            assert False
+
         statements.append(
             makeStatementAssignmentVariable(
                 variable=tmp_bases_orig if needs_orig_bases else tmp_bases,
-                source=_buildBasesTupleCreationNode(
-                    provider=provider, elements=node.bases, source_ref=source_ref
-                ),
+                source=bases_value,
                 source_ref=source_ref,
             )
         )
@@ -882,6 +956,7 @@ subclass of the metaclasses of all its bases""",
                     source_ref=internal_source_ref,
                 ),
             ),
+            for_raise=False,
             source_ref=internal_source_ref,
         ),
         exception_value=None,

nuitka/tree/ReformulationDictionaryCreation.py

@@ -173,6 +173,7 @@ def getDictUnpackingHelper():
                             source_ref=internal_source_ref,
                         ),
                     ),
+                    for_raise=False,
                     source_ref=internal_source_ref,
                 ),
                 exception_value=None,

nuitka/tree/ReformulationFunctionStatements.py

@@ -618,7 +618,7 @@ def buildParameterAnnotations(provider, node, source_ref):
     for arg in node.args.kwonlyargs:
         extractArgAnnotation(arg)
 
-    if python_version < 0x340:
+    if python_version < 0x300:
         if node.args.varargannotation is not None:
             addAnnotation(
                 key=node.args.vararg,

nuitka/tree/ReformulationMatchStatements.py

@@ -393,7 +393,7 @@ def _buildMatchClass(provider, pattern, make_against, source_ref):
             source_ref=source_ref,
         )
 
-        item_conditions = item_conditions or []
+        item_conditions = list(item_conditions or ())
 
         item_conditions.insert(
             0,
@@ -404,6 +404,8 @@ def _buildMatchClass(provider, pattern, make_against, source_ref):
             ),
         )
 
+        item_conditions = tuple(item_conditions)
+
         class_conditions_list.append(item_conditions)
         class_assignments_list.append(item_assignments)
 

nuitka/tree/ReformulationYieldExpressions.py

@@ -23,17 +23,35 @@ from .SyntaxErrors import raiseSyntaxError
 from .TreeHelpers import buildNode
 
 
+def _getErrorMessageYieldFromOutsideFunction():
+    # Need to use "exec" to detect the syntax error, pylint: disable=W0122
+
+    try:
+        exec("""yield from ()""")
+    except SyntaxError as e:
+        if "yield from" in str(e):
+            return "yield from"
+        else:
+            return "yield"
+
+
 def _checkInsideGenerator(construct_name, provider, node, source_ref):
+
     if provider.isCompiledPythonModule():
+        # Bug compatibility
+        if construct_name == "yield from":
+            construct_error_name = _getErrorMessageYieldFromOutsideFunction()
+        else:
+            construct_error_name = construct_name
+
         raiseSyntaxError(
-            "'%s' outside function"
-            % (construct_name if construct_name == "await" else "yield"),
+            "'%s' outside function" % construct_error_name,
             source_ref.atColumnNumber(node.col_offset),
         )
 
-    # This yield is forbidden in 3.5, but allowed in 3.6, but yield_from
+    # This yield is forbidden in 3.5, but allowed in 3.6, but "yield from"
     # is neither.
-    if provider.isExpressionAsyncgenObjectBody() and construct_name == "yield_from":
+    if provider.isExpressionAsyncgenObjectBody() and construct_name == "yield from":
         raiseSyntaxError(
             "'%s' inside async function"
             % ("yield" if node.__class__ is ast.Yield else "yield from",),
@@ -80,7 +98,7 @@ def buildYieldNode(provider, node, source_ref):
 def buildYieldFromNode(provider, node, source_ref):
     assert python_version >= 0x300
 
-    _checkInsideGenerator("yield_from", provider, node, source_ref)
+    _checkInsideGenerator("yield from", provider, node, source_ref)
 
     return ExpressionYieldFrom(
         expression=buildNode(provider, node.value, source_ref), source_ref=source_ref

nuitka/utils/CommandLineOptions.py

@@ -12,21 +12,44 @@ from optparse import (
     OptionParser,
 )
 
+from nuitka.Tracing import formatTerminalLink
+
 # For re-export only:
 from optparse import SUPPRESS_HELP  # isort:skip pylint: disable=unused-import
 
 
 class OurOptionGroup(OptionGroup):
+    def __init__(self, *args, **kwargs):
+        link = kwargs.pop("link", None)
+
+        OptionGroup.__init__(self, *args, **kwargs)
+
+        self.link = link
+
+    def format_help(self, formatter):
+        old_title = self.title
+
+        try:
+            if self.link is not None:
+                link = "https://nuitka.net/help/%s.html" % self.link
+
+                self.title = formatTerminalLink(self.title, link)
+            return OptionGroup.format_help(self, formatter)
+        finally:
+            self.title = old_title
+
     def add_option(self, *args, **kwargs):
         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)
 
         result = OptionGroup.add_option(self, *args, **kwargs)
 
         result.require_compiling = require_compiling
         result.github_action = github_action
         result.github_action_default = github_action_default
+        result.link = link
 
         return result
 
@@ -99,11 +122,11 @@ class OurOptionParser(OptionParser):
 
         return result
 
-    def add_option_group(self, group):
+    def add_option_group(self, group, link=None):
         # We restrain ourselves here, pylint: disable=arguments-differ
 
         if isinstance(group, str):
-            group = OurOptionGroup(self, group)
+            group = OurOptionGroup(self, group, link=link)
         self.option_groups.append(group)
 
         return group
@@ -152,7 +175,8 @@ class OurHelpFormatter(IndentedHelpFormatter):
         if option.takes_value():
             metavar = option.metavar or option.dest.upper()
             long_opts = [
-                self._long_opt_fmt % (lopt, metavar) for lopt in option._long_opts
+                self._long_opt_fmt % (long_opt, metavar)
+                for long_opt in option._long_opts
             ]
         else:
             long_opts = option._long_opts

nuitka/utils/Download.py

@@ -167,10 +167,10 @@ def getCachedDownloadedMinGW64(target_arch, assume_yes_for_downloads):
     # Large URLs, pylint: disable=line-too-long
 
     if target_arch == "x86_64":
-        url = "https://github.com/brechtsanders/winlibs_mingw/releases/download/13.2.0-16.0.6-11.0.1-msvcrt-r1/winlibs-x86_64-posix-seh-gcc-13.2.0-llvm-16.0.6-mingw-w64msvcrt-11.0.1-r1.zip"
+        url = "https://github.com/brechtsanders/winlibs_mingw/releases/download/14.2.0posix-19.1.1-12.0.0-msvcrt-r2/winlibs-x86_64-posix-seh-gcc-14.2.0-llvm-19.1.1-mingw-w64msvcrt-12.0.0-r2.zip"
         binary = r"mingw64\bin\gcc.exe"
     elif target_arch == "x86":
-        url = "https://github.com/brechtsanders/winlibs_mingw/releases/download/13.2.0-16.0.6-11.0.1-msvcrt-r1/winlibs-i686-posix-dwarf-gcc-13.2.0-llvm-16.0.6-mingw-w64msvcrt-11.0.1-r1.zip"
+        url = "https://github.com/brechtsanders/winlibs_mingw/releases/download/14.2.0posix-19.1.1-12.0.0-msvcrt-r2/winlibs-i686-posix-dwarf-gcc-14.2.0-llvm-19.1.1-mingw-w64msvcrt-12.0.0-r2.zip"
         binary = r"mingw32\bin\gcc.exe"
     elif target_arch == "arm64":
         return None

nuitka/utils/Execution.py

@@ -328,21 +328,24 @@ def wrapCommandForDebuggerForSubprocess(*args):
     return args
 
 
+@contextmanager
 def getNullOutput():
+    r = open(os.devnull, "wb")
+
     try:
-        return subprocess.NULLDEV
-    except AttributeError:
-        return open(os.devnull, "wb")
+        yield r
+    finally:
+        r.close()
 
 
+@contextmanager
 def getNullInput():
-    # spell-checker: ignore NULLDEV
+    r = open(os.devnull, "rb")
+
     try:
-        return subprocess.NULLDEV
-    except AttributeError:
-        # File is supposed to stay open, pylint: disable=consider-using-with
-        subprocess.NULLDEV = open(os.devnull, "rb")
-        return subprocess.NULLDEV
+        yield r
+    finally:
+        r.close()
 
 
 def executeToolChecked(
@@ -364,13 +367,14 @@ def executeToolChecked(
     command[0] = getExecutablePath(tool)
 
     with withEnvironmentVarOverridden("LC_ALL", "C"):
-        process = subprocess.Popen(
-            command,
-            stdin=getNullInput(),
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            shell=False,
-        )
+        with getNullInput() as null_input:
+            process = subprocess.Popen(
+                command,
+                stdin=null_input,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                shell=False,
+            )
 
     stdout, stderr = process.communicate()
     result = process.poll()
@@ -413,21 +417,22 @@ def createProcess(
         else:
             kw_args["preexec_fn"] = os.setsid
 
-    process = subprocess.Popen(
-        command,
-        # Note: Empty string should also be allowed for stdin, therefore check
-        # for default "False" and "None" precisely.
-        stdin=subprocess.PIPE if stdin not in (False, None) else getNullInput(),
-        stdout=subprocess.PIPE if stdout is None else stdout,
-        stderr=subprocess.PIPE if stderr is None else stderr,
-        shell=shell,
-        # On Windows, closing file descriptions is not working with capturing outputs.
-        close_fds=not isWin32Windows(),
-        env=env,
-        # For tools that want short paths to work.
-        cwd=getExternalUsePath(os.getcwd()) if external_cwd else None,
-        **kw_args
-    )
+    with getNullInput() as null_input:
+        process = subprocess.Popen(
+            command,
+            # Note: Empty string should also be allowed for stdin, therefore check
+            # for default "False" and "None" precisely.
+            stdin=subprocess.PIPE if stdin not in (False, None) else null_input,
+            stdout=subprocess.PIPE if stdout is None else stdout,
+            stderr=subprocess.PIPE if stderr is None else stderr,
+            shell=shell,
+            # On Windows, closing file descriptions is not working with capturing outputs.
+            close_fds=not isWin32Windows(),
+            env=env,
+            # For tools that want short paths to work.
+            cwd=getExternalUsePath(os.getcwd()) if external_cwd else None,
+            **kw_args
+        )
 
     return process