Nuitka-winsvc 2.3.11__cp311-cp311-win_amd64.whl → 2.4.1__cp311-cp311-win_amd64.whl

nuitka/tree/ReformulationClasses.py

@@ -11,7 +11,7 @@ source code comments with Developer Manual sections.
 from nuitka.nodes.AttributeNodes import makeExpressionAttributeLookup
 from nuitka.nodes.BuiltinRefNodes import ExpressionBuiltinAnonymousRef
 from nuitka.nodes.CallNodes import makeExpressionCall
-from nuitka.nodes.ClassNodes import ExpressionClassBodyP2
+from nuitka.nodes.ClassNodes import ExpressionClassDictBody
 from nuitka.nodes.CodeObjectSpecs import CodeObjectSpec
 from nuitka.nodes.ConditionalNodes import ExpressionConditional
 from nuitka.nodes.ConstantRefNodes import makeConstantRefNode
@@ -41,15 +41,14 @@ from nuitka.nodes.VariableNameNodes import (
     StatementAssignmentVariableName,
 )
 from nuitka.nodes.VariableRefNodes import ExpressionTempVariableRef
-from nuitka.nodes.VariableReleaseNodes import (
-    makeStatementReleaseVariable,
-    makeStatementsReleaseVariables,
-)
 from nuitka.plugins.Plugins import Plugins
 from nuitka.PythonVersions import python_version
 
 from .ReformulationClasses3 import buildClassNode3
-from .ReformulationTryFinallyStatements import makeTryFinallyStatement
+from .ReformulationTryFinallyStatements import (
+    makeTryFinallyReleaseStatement,
+    makeTryFinallyStatement,
+)
 from .TreeHelpers import (
     buildFrameNode,
     buildNodeTuple,
@@ -70,7 +69,7 @@ def buildClassNode2(provider, node, source_ref):
 
     class_statement_nodes, class_doc = extractDocFromBody(node)
 
-    function_body = ExpressionClassBodyP2(
+    function_body = ExpressionClassDictBody(
         provider=provider, name=node.name, doc=class_doc, source_ref=source_ref
     )
 
@@ -191,7 +190,7 @@ def buildClassNode2(provider, node, source_ref):
                 ),
                 source_ref=source_ref,
             ),
-            makeTryFinallyStatement(
+            makeTryFinallyReleaseStatement(
                 provider,
                 tried=StatementTry(
                     tried=makeStatementsSequenceFromStatement(
@@ -222,11 +221,8 @@ def buildClassNode2(provider, node, source_ref):
                     return_handler=None,
                     source_ref=source_ref,
                 ),
-                final=makeStatementReleaseVariable(
-                    variable=tmp_base, source_ref=source_ref
-                ),
+                variables=(tmp_base,),
                 source_ref=source_ref,
-                public_exc=False,
             ),
         )
     else:
@@ -370,13 +366,10 @@ def buildClassNode2(provider, node, source_ref):
         )
     )
 
-    return makeTryFinallyStatement(
+    return makeTryFinallyReleaseStatement(
         provider=function_body,
         tried=statements,
-        final=makeStatementsReleaseVariables(
-            variables=(tmp_class, tmp_bases, tmp_class_dict, tmp_metaclass),
-            source_ref=source_ref,
-        ),
+        variables=(tmp_class, tmp_bases, tmp_class_dict, tmp_metaclass),
         source_ref=source_ref,
     )
 

nuitka/tree/ReformulationClasses3.py

@@ -19,7 +19,8 @@ from nuitka.nodes.BuiltinRefNodes import makeExpressionBuiltinTypeRef
 from nuitka.nodes.BuiltinTypeNodes import ExpressionBuiltinTuple
 from nuitka.nodes.CallNodes import makeExpressionCall
 from nuitka.nodes.ClassNodes import (
-    ExpressionClassBodyP3,
+    ExpressionClassDictBody,
+    ExpressionClassMappingBody,
     ExpressionSelectMetaclass,
 )
 from nuitka.nodes.CodeObjectSpecs import CodeObjectSpec
@@ -76,7 +77,6 @@ from nuitka.nodes.VariableRefNodes import (
     ExpressionTempVariableRef,
     ExpressionVariableRef,
 )
-from nuitka.nodes.VariableReleaseNodes import makeStatementsReleaseVariables
 from nuitka.Options import isExperimental
 from nuitka.plugins.Plugins import Plugins
 from nuitka.PythonVersions import python_version
@@ -90,7 +90,10 @@ from .InternalModule import (
 from .ReformulationDictionaryCreation import buildDictionaryUnpacking
 from .ReformulationSequenceCreation import buildTupleUnpacking
 from .ReformulationTryExceptStatements import makeTryExceptSingleHandlerNode
-from .ReformulationTryFinallyStatements import makeTryFinallyStatement
+from .ReformulationTryFinallyStatements import (
+    makeTryFinallyReleaseStatement,
+    makeTryFinallyStatement,
+)
 from .TreeHelpers import (
     buildFrameNode,
     buildNodeTuple,
@@ -119,10 +122,26 @@ def _buildBasesTupleCreationNode(provider, elements, source_ref):
     )
 
 
+def _selectClassBody(_static_qualname):
+    if isExperimental("force-p2-class"):
+        return ExpressionClassDictBody
+    else:
+        return ExpressionClassMappingBody
+
+
+def _needsOrigBases(_static_qualname):
+    if isExperimental("force-p2-class"):
+        return False
+    elif python_version < 0x370:
+        return False
+    else:
+        return True
+
+
 def buildClassNode3(provider, node, source_ref):
     # Many variables, due to the huge re-formulation that is going on here,
     # which just has the complexity and optimization checks:
-    # pylint: disable=I0021,too-many-branches,too-many-locals,too-many-statements
+    # pylint: disable=too-many-branches,too-many-locals,too-many-statements
 
     # This function is the Python3 special case with special re-formulation as
     # according to Developer Manual.
@@ -145,7 +164,12 @@ def buildClassNode3(provider, node, source_ref):
         temp_scope=temp_scope, name="prepared", temp_type="object"
     )
 
-    class_creation_function = ExpressionClassBodyP3(
+    # Can be overridden, but for code object creation, we use that.
+    static_qualname = provider.getChildQualname(node.name)
+
+    class_body_class = _selectClassBody(static_qualname)
+
+    class_creation_function = class_body_class(
         provider=provider, name=node.name, doc=class_doc, source_ref=source_ref
     )
 
@@ -166,7 +190,7 @@ def buildClassNode3(provider, node, source_ref):
 
     code_object = CodeObjectSpec(
         co_name=node.name,
-        co_qualname=provider.getChildQualname(node.name),
+        co_qualname=static_qualname,
         co_kind="Class",
         co_varnames=(),
         co_freevars=(),
@@ -247,7 +271,7 @@ def buildClassNode3(provider, node, source_ref):
         )
     )
 
-    if python_version >= 0x340:
+    if python_version >= 0x300:
         qualname_assign = statements[-1]
 
     if python_version >= 0x360 and class_creation_function.needsAnnotationsDictionary():
@@ -264,12 +288,14 @@ def buildClassNode3(provider, node, source_ref):
 
     statements.append(body)
 
+    needs_orig_bases = _needsOrigBases(static_qualname)
+
     if node.bases:
         tmp_bases = provider.allocateTempVariable(
             temp_scope=temp_scope, name="bases", temp_type="object"
         )
 
-        if python_version >= 0x370:
+        if needs_orig_bases:
             tmp_bases_orig = provider.allocateTempVariable(
                 temp_scope=temp_scope, name="bases_orig", temp_type="object"
             )
@@ -282,7 +308,9 @@ def buildClassNode3(provider, node, source_ref):
         def makeBasesRef():
             return makeConstantRefNode(constant=(), source_ref=source_ref)
 
-    if python_version >= 0x370 and node.bases:
+        needs_orig_bases = False
+
+    if node.bases and needs_orig_bases:
         statements.append(
             makeStatementConditional(
                 condition=makeComparisonExpression(
@@ -339,6 +367,7 @@ def buildClassNode3(provider, node, source_ref):
         StatementReturn(expression=class_variable_ref, source_ref=source_ref),
     )
 
+    # TODO: Is this something similar to makeTryFinallyReleaseStatement
     body = makeStatementsSequenceFromStatement(
         statement=makeTryFinallyStatement(
             provider=class_creation_function,
@@ -377,7 +406,7 @@ def buildClassNode3(provider, node, source_ref):
     if node.bases:
         statements.append(
             makeStatementAssignmentVariable(
-                variable=tmp_bases if python_version < 0x370 else tmp_bases_orig,
+                variable=tmp_bases_orig if needs_orig_bases else tmp_bases,
                 source=_buildBasesTupleCreationNode(
                     provider=provider, elements=node.bases, source_ref=source_ref
                 ),
@@ -385,7 +414,7 @@ def buildClassNode3(provider, node, source_ref):
             )
         )
 
-        if python_version >= 0x370:
+        if needs_orig_bases:
             bases_conversion = makeExpressionFunctionCall(
                 function=makeExpressionFunctionCreation(
                     function_ref=ExpressionFunctionRef(
@@ -457,7 +486,7 @@ def buildClassNode3(provider, node, source_ref):
 
         # Might become empty behind our back during conversion, therefore make the
         # check at run time for 3.7 or higher.
-        if python_version >= 0x370:
+        if needs_orig_bases:
             unspecified_metaclass_expression = ExpressionConditional(
                 condition=ExpressionTempVariableRef(
                     variable=tmp_bases, source_ref=source_ref
@@ -545,6 +574,17 @@ def buildClassNode3(provider, node, source_ref):
             ),
         )
 
+    if class_body_class is ExpressionClassDictBody:
+        prepare_condition = makeConstantRefNode(constant=False, source_ref=source_ref)
+    else:
+        prepare_condition = ExpressionAttributeCheck(
+            expression=ExpressionTempVariableRef(
+                variable=tmp_metaclass, source_ref=source_ref
+            ),
+            attribute_name="__prepare__",
+            source_ref=source_ref,
+        )
+
     statements += (
         makeStatementAssignmentVariable(
             variable=tmp_metaclass,
@@ -603,13 +643,7 @@ def buildClassNode3(provider, node, source_ref):
             source_ref=source_ref,
         ),
         makeStatementConditional(
-            condition=ExpressionAttributeCheck(
-                expression=ExpressionTempVariableRef(
-                    variable=tmp_metaclass, source_ref=source_ref
-                ),
-                attribute_name="__prepare__",
-                source_ref=source_ref,
-            ),
+            condition=prepare_condition,
             yes_branch=call_prepare,
             no_branch=makeStatementAssignmentVariable(
                 variable=tmp_prepared,
@@ -628,21 +662,19 @@ def buildClassNode3(provider, node, source_ref):
         ),
     )
 
-    if python_version >= 0x340:
+    if python_version >= 0x300:
         class_creation_function.qualname_setup = node.name, qualname_assign
 
     tmp_variables = [tmp_class_decl_dict, tmp_metaclass, tmp_prepared]
     if node.bases:
         tmp_variables.insert(0, tmp_bases)
-        if python_version >= 0x370:
+        if needs_orig_bases:
             tmp_variables.insert(0, tmp_bases_orig)
 
-    return makeTryFinallyStatement(
+    return makeTryFinallyReleaseStatement(
         provider=provider,
         tried=statements,
-        final=makeStatementsReleaseVariables(
-            variables=tmp_variables, source_ref=source_ref
-        ),
+        variables=tmp_variables,
         source_ref=source_ref,
     )
 
@@ -798,17 +830,14 @@ def getClassBasesMroConversionHelper():
 
     result.setChildBody(
         makeStatementsSequenceFromStatement(
-            makeTryFinallyStatement(
+            makeTryFinallyReleaseStatement(
                 provider=result,
                 tried=tried,
-                final=makeStatementsReleaseVariables(
-                    variables=(
-                        args_variable,
-                        tmp_result_variable,
-                        tmp_iter_variable,
-                        tmp_item_variable,
-                    ),
-                    source_ref=internal_source_ref,
+                variables=(
+                    args_variable,
+                    tmp_result_variable,
+                    tmp_iter_variable,
+                    tmp_item_variable,
                 ),
                 source_ref=internal_source_ref,
             )
@@ -1012,17 +1041,14 @@ def getClassSelectMetaClassHelper():
 
     result.setChildBody(
         makeStatementsSequenceFromStatement(
-            makeTryFinallyStatement(
+            makeTryFinallyReleaseStatement(
                 provider=result,
                 tried=tried,
-                final=makeStatementsReleaseVariables(
-                    variables=(
-                        tmp_winner_variable,
-                        tmp_iter_variable,
-                        tmp_item_variable,
-                        tmp_item_type_variable,
-                    ),
-                    source_ref=internal_source_ref,
+                variables=(
+                    tmp_winner_variable,
+                    tmp_iter_variable,
+                    tmp_item_variable,
+                    tmp_item_type_variable,
                 ),
                 source_ref=internal_source_ref,
             )

nuitka/tree/ReformulationComparisonExpressions.py

@@ -15,9 +15,8 @@ from nuitka.nodes.OutlineNodes import ExpressionOutlineBody
 from nuitka.nodes.ReturnNodes import StatementReturn
 from nuitka.nodes.VariableAssignNodes import makeStatementAssignmentVariable
 from nuitka.nodes.VariableRefNodes import ExpressionTempVariableRef
-from nuitka.nodes.VariableReleaseNodes import makeStatementReleaseVariable
 
-from .ReformulationTryFinallyStatements import makeTryFinallyStatement
+from .ReformulationTryFinallyStatements import makeTryFinallyReleaseStatement
 from .TreeHelpers import (
     buildNode,
     getKind,
@@ -83,11 +82,6 @@ def buildComplexComparisonNode(provider, left, rights, comparators, source_ref):
             variable=variables[count], source=value, source_ref=source_ref
         )
 
-    def makeReleaseStatement(count):
-        return makeStatementReleaseVariable(
-            variable=variables[count], source_ref=source_ref
-        )
-
     def makeValueComparisonReturn(left, right, comparator):
         yield makeStatementAssignmentVariable(
             variable=tmp_variable,
@@ -115,12 +109,12 @@ def buildComplexComparisonNode(provider, left, rights, comparators, source_ref):
         )
 
     statements = []
-    final = []
+    release_variables = []
 
     for count, value in enumerate(rights):
         if value is not rights[-1]:
             statements.append(makeTempAssignment(count, value))
-            final.append(makeReleaseStatement(count))
+            release_variables.append(variables[count])
             right = ExpressionTempVariableRef(
                 variable=variables[count], source_ref=source_ref
             )
@@ -148,18 +142,14 @@ def buildComplexComparisonNode(provider, left, rights, comparators, source_ref):
                     source_ref=source_ref,
                 )
             )
-            final.append(
-                makeStatementReleaseVariable(
-                    variable=tmp_variable, source_ref=source_ref
-                )
-            )
+            release_variables.append(tmp_variable)
 
     outline_body.setChildBody(
         makeStatementsSequenceFromStatement(
-            statement=makeTryFinallyStatement(
+            statement=makeTryFinallyReleaseStatement(
                 provider=outline_body,
                 tried=statements,
-                final=final,
+                variables=release_variables,
                 source_ref=source_ref,
             )
         )

nuitka/tree/ReformulationContractionExpressions.py

@@ -53,10 +53,7 @@ from nuitka.nodes.StatementNodes import (
 )
 from nuitka.nodes.VariableAssignNodes import makeStatementAssignmentVariable
 from nuitka.nodes.VariableRefNodes import ExpressionTempVariableRef
-from nuitka.nodes.VariableReleaseNodes import (
-    makeStatementReleaseVariable,
-    makeStatementsReleaseVariables,
-)
+from nuitka.nodes.VariableReleaseNodes import makeStatementReleaseVariable
 from nuitka.nodes.YieldNodes import (
     ExpressionYield,
     ExpressionYieldFromAwaitable,
@@ -66,7 +63,7 @@ from nuitka.PythonVersions import python_version
 from .ReformulationAssignmentStatements import buildAssignmentStatements
 from .ReformulationBooleanExpressions import makeAndNode
 from .ReformulationTryExceptStatements import makeTryExceptSingleHandlerNode
-from .ReformulationTryFinallyStatements import makeTryFinallyStatement
+from .ReformulationTryFinallyStatements import makeTryFinallyReleaseStatement
 from .TreeHelpers import (
     buildNode,
     buildNodeList,
@@ -134,7 +131,7 @@ def _buildPython2ListContraction(provider, node, source_ref):
         temp_scope=None, name="contraction_result", temp_type="object"
     )
 
-    statements, release_statements = _buildContractionBodyNode(
+    statements, release_variables = _buildContractionBodyNode(
         provider=provider,
         node=node,
         emit_class=StatementListOperationAppend,
@@ -155,10 +152,10 @@ def _buildPython2ListContraction(provider, node, source_ref):
         source_ref=source_ref,
     )
 
-    statement = makeTryFinallyStatement(
+    statement = makeTryFinallyReleaseStatement(
         provider=function_body,
         tried=mergeStatements((statements, return_statement)),
-        final=release_statements,
+        variables=release_variables,
         source_ref=source_ref.atInternal(),
     )
 
@@ -289,7 +286,7 @@ def buildGeneratorExpressionNode(provider, node, source_ref):
                 ),
                 source_ref=source_ref,
             ),
-            makeTryFinallyStatement(
+            makeTryFinallyReleaseStatement(
                 provider=function_body,
                 tried=StatementReturn(
                     expression=maker_class(
@@ -300,15 +297,13 @@ def buildGeneratorExpressionNode(provider, node, source_ref):
                     ),
                     source_ref=source_ref,
                 ),
-                final=makeStatementReleaseVariable(
-                    variable=iter_tmp, source_ref=source_ref
-                ),
+                variables=(iter_tmp,),
                 source_ref=source_ref,
             ),
         )
     )
 
-    statements, release_statements = _buildContractionBodyNode(
+    statements, release_variables = _buildContractionBodyNode(
         provider=provider,
         node=node,
         emit_class=ExpressionYield,
@@ -326,10 +321,10 @@ def buildGeneratorExpressionNode(provider, node, source_ref):
         statements += (StatementGeneratorReturnNone(source_ref=source_ref),)
 
     statements = (
-        makeTryFinallyStatement(
+        makeTryFinallyReleaseStatement(
             provider=function_body,
             tried=statements,
-            final=release_statements,
+            variables=release_variables,
             source_ref=source_ref.atInternal(),
         ),
     )
@@ -566,11 +561,7 @@ def _buildContractionBodyNode(
     statements.append(current_body)
     statements = mergeStatements(statements)
 
-    release_statements = makeStatementsReleaseVariables(
-        variables=tmp_variables, source_ref=source_ref
-    )
-
-    return statements, release_statements
+    return statements, tmp_variables
 
 
 def _buildContractionNode(provider, node, name, emit_class, start_value, source_ref):
@@ -591,7 +582,7 @@ def _buildContractionNode(provider, node, name, emit_class, start_value, source_
         temp_scope=None, name="contraction", temp_type="object"
     )
 
-    statements, release_statements = _buildContractionBodyNode(
+    statements, release_variables = _buildContractionBodyNode(
         provider=provider,
         node=node,
         emit_class=emit_class,
@@ -624,10 +615,10 @@ def _buildContractionNode(provider, node, name, emit_class, start_value, source_
     )
 
     statements = (
-        makeTryFinallyStatement(
+        makeTryFinallyReleaseStatement(
             provider=function_body,
             tried=mergeStatements((statements, return_statement)),
-            final=release_statements,
+            variables=release_variables,
             source_ref=source_ref.atInternal(),
         ),
     )

nuitka/tree/ReformulationDictionaryCreation.py

@@ -47,7 +47,6 @@ from nuitka.nodes.VariableRefNodes import (
     ExpressionTempVariableRef,
     ExpressionVariableRef,
 )
-from nuitka.nodes.VariableReleaseNodes import makeStatementsReleaseVariables
 from nuitka.PythonVersions import python_version
 from nuitka.specs.ParameterSpecs import ParameterSpec
 
@@ -57,7 +56,7 @@ from .InternalModule import (
     once_decorator,
 )
 from .ReformulationTryExceptStatements import makeTryExceptSingleHandlerNode
-from .ReformulationTryFinallyStatements import makeTryFinallyStatement
+from .ReformulationTryFinallyStatements import makeTryFinallyReleaseStatement
 from .TreeHelpers import (
     buildNode,
     buildNodeTuple,
@@ -214,16 +213,13 @@ def getDictUnpackingHelper():
 
     result.setChildBody(
         makeStatementsSequenceFromStatement(
-            makeTryFinallyStatement(
+            makeTryFinallyReleaseStatement(
                 provider=result,
                 tried=tried,
-                final=makeStatementsReleaseVariables(
-                    variables=(
-                        tmp_result_variable,
-                        tmp_iter_variable,
-                        tmp_item_variable,
-                    ),
-                    source_ref=internal_source_ref,
+                variables=(
+                    tmp_result_variable,
+                    tmp_iter_variable,
+                    tmp_item_variable,
                 ),
                 source_ref=internal_source_ref,
             )

nuitka/tree/ReformulationExecStatements.py

@@ -26,7 +26,10 @@ from nuitka.nodes.VariableAssignNodes import makeStatementAssignmentVariable
 from nuitka.nodes.VariableRefNodes import ExpressionTempVariableRef
 from nuitka.nodes.VariableReleaseNodes import makeStatementsReleaseVariables
 
-from .ReformulationTryFinallyStatements import makeTryFinallyStatement
+from .ReformulationTryFinallyStatements import (
+    makeTryFinallyReleaseStatement,
+    makeTryFinallyStatement,
+)
 from .TreeHelpers import (
     buildNode,
     getKind,
@@ -351,17 +354,14 @@ exec: arg 1 must be a string, file, or code object""",
         ),
     )
 
-    return makeTryFinallyStatement(
+    return makeTryFinallyReleaseStatement(
         provider=provider,
         tried=tried,
-        final=makeStatementsReleaseVariables(
-            variables=(
-                source_variable,
-                globals_keeper_variable,
-                locals_keeper_variable,
-                plain_indicator_variable,
-            ),
-            source_ref=source_ref,
+        variables=(
+            source_variable,
+            globals_keeper_variable,
+            locals_keeper_variable,
+            plain_indicator_variable,
         ),
         source_ref=source_ref,
     )

nuitka/tree/ReformulationForLoopStatements.py

@@ -18,15 +18,13 @@ from nuitka.nodes.ComparisonNodes import ExpressionComparisonIs
 from nuitka.nodes.ConditionalNodes import makeStatementConditional
 from nuitka.nodes.ConstantRefNodes import makeConstantRefNode
 from nuitka.nodes.LoopNodes import StatementLoop, StatementLoopBreak
-from nuitka.nodes.StatementNodes import StatementsSequence
 from nuitka.nodes.VariableAssignNodes import makeStatementAssignmentVariable
 from nuitka.nodes.VariableRefNodes import ExpressionTempVariableRef
-from nuitka.nodes.VariableReleaseNodes import makeStatementReleaseVariable
 from nuitka.nodes.YieldNodes import ExpressionYieldFromAwaitable
 
 from .ReformulationAssignmentStatements import buildAssignmentStatements
 from .ReformulationTryExceptStatements import makeTryExceptSingleHandlerNode
-from .ReformulationTryFinallyStatements import makeTryFinallyStatement
+from .ReformulationTryFinallyStatements import makeTryFinallyReleaseStatement
 from .TreeHelpers import (
     buildNode,
     buildStatementsNode,
@@ -133,11 +131,9 @@ def _buildForLoopNode(provider, node, sync, source_ref):
         statements=statements, allow_none=True, source_ref=source_ref
     )
 
-    cleanup_statements = (
-        makeStatementReleaseVariable(
-            variable=tmp_value_variable, source_ref=source_ref
-        ),
-        makeStatementReleaseVariable(variable=tmp_iter_variable, source_ref=source_ref),
+    cleanup_variables = (
+        tmp_value_variable,
+        tmp_iter_variable,
     )
 
     if else_block is not None:
@@ -168,12 +164,10 @@ def _buildForLoopNode(provider, node, sync, source_ref):
         makeStatementAssignmentVariable(
             variable=tmp_iter_variable, source=iter_source, source_ref=source_ref
         ),
-        makeTryFinallyStatement(
+        makeTryFinallyReleaseStatement(
             provider=provider,
             tried=StatementLoop(loop_body=loop_body, source_ref=source_ref),
-            final=StatementsSequence(
-                statements=cleanup_statements, source_ref=source_ref
-            ),
+            variables=cleanup_variables,
             source_ref=source_ref,
         ),
     )