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

nuitka/code_generation/BranchCodes.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
 
 
 """ Branch related codes.

nuitka/code_generation/BuiltinCodes.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
 
 
 """ Built-in codes
@@ -462,6 +462,15 @@ def getBuiltinCallViaSpecCode(spec, to_name, called_name, expression, emit, cont
         expression=expression, emit=emit, context=context
     )
 
+    value_names = []
+    for arg_value_name in arg_value_names:
+        if arg_value_name is None:
+            value_names.append("NULL")
+        elif type(arg_value_name) is tuple:
+            value_names.extend(arg_value_name)
+        else:
+            value_names.append(arg_value_name)
+
     with withObjectCodeTemporaryAssignment(
         to_name, "%s_result" % spec.name.replace(".", "_"), expression, emit, context
     ) as value_name:
@@ -485,11 +494,10 @@ def getBuiltinCallViaSpecCode(spec, to_name, called_name, expression, emit, cont
                 "to_name": value_name,
                 "called_name": called_name,
                 "arg_names": ",".join(
-                    '"%s"' % arg_name for arg_name in spec.getArgumentNames()
+                    '"%s"' % arg_name for arg_name in spec.getParameterNames2()
                 ),
                 "arg_value_names": ",".join(
-                    (str(arg_value_name) if arg_value_name else "NULL")
-                    for arg_value_name in arg_value_names
+                    str(value_name) for value_name in value_names
                 ),
                 "kw_only_count": spec.getKwOnlyParameterCount(),
             }
@@ -497,11 +505,13 @@ def getBuiltinCallViaSpecCode(spec, to_name, called_name, expression, emit, cont
 
         getErrorExitCode(
             check_name=value_name,
-            release_names=[called_name] + list(arg_value_names),
+            release_names=[called_name] + value_names,
             emit=emit,
             context=context,
         )
 
+        context.addCleanupTempName(value_name)
+
 
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.

nuitka/code_generation/CallCodes.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
 
 
 """ Code generation for calls.

nuitka/code_generation/ClassCodes.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
 
 
 """ Codes for classes.

nuitka/code_generation/CodeGeneration.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
 
 
 """ The code generation.
@@ -404,21 +404,25 @@ def generateFunctionBodyCode(function_body, context):
     needs_exception_exit = function_body.mayRaiseException(BaseException)
 
     if function_body.isExpressionGeneratorObjectBody():
-        function_code = getGeneratorObjectCode(
-            context=function_context,
-            function_identifier=function_identifier,
-            closure_variables=function_body.getClosureVariables(),
-            user_variables=function_body.getUserLocalVariables(),
-            outline_variables=function_body.getOutlineLocalVariables(),
-            temp_variables=function_body.getTempVariables(),
-            needs_exception_exit=needs_exception_exit,
-            needs_generator_return=function_body.needsGeneratorReturnExit(),
-        )
+        if function_body.subnode_body is not None:
+            function_code = getGeneratorObjectCode(
+                context=function_context,
+                function_identifier=function_identifier,
+                closure_variables=function_body.getClosureVariables(),
+                user_variables=function_body.getUserLocalVariables(),
+                outline_variables=function_body.getOutlineLocalVariables(),
+                temp_variables=function_body.getTempVariables(),
+                needs_exception_exit=needs_exception_exit,
+                needs_generator_return=function_body.needsGeneratorReturnExit(),
+            )
 
-        function_decl = getGeneratorObjectDeclCode(
-            function_identifier=function_identifier,
-            closure_variables=function_body.getClosureVariables(),
-        )
+            function_decl = getGeneratorObjectDeclCode(
+                function_identifier=function_identifier,
+                closure_variables=function_body.getClosureVariables(),
+            )
+        else:
+            function_code = None
+            function_decl = None
     elif function_body.isExpressionCoroutineObjectBody():
         function_code = getCoroutineObjectCode(
             context=function_context,
@@ -535,7 +539,8 @@ def _generateModuleCode(module, data_filename):
             function_body=function_body, context=context
         )
 
-        function_body_codes.append(function_code)
+        if function_code is not None:
+            function_body_codes.append(function_code)
 
         if function_decl is not None:
             function_decl_codes.append(function_decl)
@@ -933,7 +938,8 @@ addExpressionDispatchDict(
         "EXPRESSION_PKG_RESOURCES_RESOURCE_STRING_CALL": generatePkgResourcesResourceStringCallCode,
         "EXPRESSION_PKG_RESOURCES_RESOURCE_STREAM_CALL": generatePkgResourcesResourceStreamCallCode,
         "EXPRESSION_IMPORTLIB_RESOURCES_READ_BINARY_CALL": generateImportlibResourcesReadBinaryCallCode,
-        "EXPRESSION_IMPORTLIB_RESOURCES_READ_TEXT_CALL": generateImportlibResourcesReadTextCallCode,
+        "EXPRESSION_IMPORTLIB_RESOURCES_READ_TEXT_BEFORE_313_CALL": generateImportlibResourcesReadTextCallCode,
+        "EXPRESSION_IMPORTLIB_RESOURCES_READ_TEXT_SINCE_313_CALL": generateImportlibResourcesReadTextCallCode,
         "EXPRESSION_IMPORTLIB_RESOURCES_FILES_CALL": generateImportlibResourcesFilesCallCode,
         "EXPRESSION_IMPORTLIB_RESOURCES_BACKPORT_FILES_CALL": generateImportlibResourcesFilesCallCode,
         "EXPRESSION_IMPORTLIB_RESOURCES_FILES_CALL_FIXED": generateImportlibResourcesFilesCallCode,

nuitka/code_generation/CodeHelperSelection.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
 
 
 """ Select from code helpers.

nuitka/code_generation/CodeHelpers.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
 
 
 """ Helpers for code generation.

nuitka/code_generation/CodeObjectCodes.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
 
 
 """ Code generation for code objects.
@@ -9,11 +9,14 @@ Right now only the creation is done here. But more should be added later on.
 import os
 
 from nuitka.__past__ import unicode
-from nuitka.Options import getFileReferenceMode
+from nuitka.Options import getFileReferenceMode, isExperimental
 from nuitka.PythonVersions import python_version
 
 
 def getCodeObjectsDeclCode(context):
+    if isExperimental("new-code-objects"):
+        return ()
+
     statements = []
 
     for _code_object_key, code_identifier in context.getCodeObjects():
@@ -34,6 +37,7 @@ def _getMakeCodeObjectArgs(code_object_handle, context):
     This is also version dependent, but we hide this behind macros
     that ignore some arguments.
     """
+    assert not isExperimental("new-code-objects")
 
     co_flags = []
 
@@ -90,6 +94,9 @@ def getCodeObjectsInitCode(context):
     # There is a bit of details to this, and we are making some optimizations as
     # well as customization to what path should be put there.
 
+    if isExperimental("new-code-objects"):
+        return ()
+
     statements = []
 
     code_objects = context.getCodeObjects()
@@ -132,6 +139,16 @@ def getCodeObjectsInitCode(context):
     return statements
 
 
+def getCodeObjectAccessCode(code_object, context):
+    if isExperimental("new-code-objects"):
+        return (
+            "USE_CODE_OBJECT(tstate, %s, module_filename_obj)"
+            % context.getConstantCode(code_object)
+        )
+    else:
+        return context.getCodeObjectHandle(code_object)
+
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #

nuitka/code_generation/ComparisonCodes.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
 
 
 """ Comparison related codes.

nuitka/code_generation/ComparisonHelperDefinitions.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
 
 
 """ Shared definitions of what comparison operation helpers are available.

nuitka/code_generation/ConditionalCodes.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
 
 
 """ Conditional statements related codes.

nuitka/code_generation/ConstantCodes.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
 
 
 """ Low level constant code generation.

nuitka/code_generation/Contexts.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
 
 
 """ Code generation contexts.
@@ -262,6 +262,8 @@ class TempMixin(object):
         del self.cleanup_names[-1]
 
 
+# TODO: Remove when isExperimental("new-code-objects") is becoming the
+# standard.
 CodeObjectHandle = collections.namedtuple(
     "CodeObjectHandle",
     (
@@ -284,43 +286,50 @@ CodeObjectHandle = collections.namedtuple(
 )
 
 
-class CodeObjectsMixin(object):
-    # Mixins are not allowed to specify slots, pylint: disable=assigning-non-slot
-    __slots__ = ()
-
-    def __init__(self):
-        # Code objects needed made unique by a key.
-        self.code_objects = {}
-
-    def getCodeObjects(self):
-        return sorted(iterItems(self.code_objects))
-
-    def getCodeObjectHandle(self, code_object):
-        key = CodeObjectHandle(
-            co_filename=code_object.getFilename(),
-            co_name=code_object.getCodeObjectName(),
-            co_qualname=code_object.getCodeObjectQualname(),
-            line_number=code_object.getLineNumber(),
-            co_varnames=code_object.getVarNames(),
-            co_argcount=code_object.getArgumentCount(),
-            co_freevars=code_object.getFreeVarNames(),
-            co_posonlyargcount=code_object.getPosOnlyParameterCount(),
-            co_kwonlyargcount=code_object.getKwOnlyParameterCount(),
-            co_kind=code_object.getCodeObjectKind(),
-            is_optimized=code_object.getFlagIsOptimizedValue(),
-            co_new_locals=code_object.getFlagNewLocalsValue(),
-            co_has_starlist=code_object.hasStarListArg(),
-            co_has_stardict=code_object.hasStarDictArg(),
-            future_flags=code_object.getFutureSpec().asFlags(),
-        )
+if Options.isExperimental("new-code-objects"):
+
+    class CodeObjectsMixin(object):
+        __slots__ = ()
+
+else:
+
+    class CodeObjectsMixin(object):
+        # Mixins are not allowed to specify slots, pylint: disable=assigning-non-slot
+        __slots__ = ()
+
+        def __init__(self):
+            # Code objects needed made unique by a key.
+            self.code_objects = {}
+
+        def getCodeObjects(self):
+            return sorted(iterItems(self.code_objects))
+
+        def getCodeObjectHandle(self, code_object):
+            key = CodeObjectHandle(
+                co_filename=code_object.getFilename(),
+                co_name=code_object.getCodeObjectName(),
+                co_qualname=code_object.getCodeObjectQualname(),
+                line_number=code_object.getLineNumber(),
+                co_varnames=code_object.getVarNames(),
+                co_argcount=code_object.getArgumentCount(),
+                co_freevars=code_object.getFreeVarNames(),
+                co_posonlyargcount=code_object.getPosOnlyParameterCount(),
+                co_kwonlyargcount=code_object.getKwOnlyParameterCount(),
+                co_kind=code_object.getCodeObjectKind(),
+                is_optimized=code_object.getFlagIsOptimizedValue(),
+                co_new_locals=code_object.getFlagNewLocalsValue(),
+                co_has_starlist=code_object.hasStarListArg(),
+                co_has_stardict=code_object.hasStarDictArg(),
+                future_flags=code_object.getFutureSpec().asFlags(),
+            )
 
-        if key not in self.code_objects:
-            self.code_objects[key] = "code_objects_%s" % self._calcHash(key)
+            if key not in self.code_objects:
+                self.code_objects[key] = "code_objects_%s" % self._calcHash(key)
 
-        return self.code_objects[key]
+            return self.code_objects[key]
 
-    def _calcHash(self, key):
-        return getStringHash("-".join(str(s) for s in key))
+        def _calcHash(self, key):
+            return getStringHash("-".join(str(s) for s in key))
 
 
 class PythonContextBase(getMetaClassBase("Context", require_slots=True)):
@@ -591,7 +600,7 @@ class FrameDeclarationsMixin(object):
     def getFrameHandle(self):
         return self.frame_stack[-1]
 
-    def pushFrameHandle(self, code_identifier, is_light):
+    def pushFrameHandle(self, frame_code_name, is_light):
         self.frames_used += 1
 
         if is_light:
@@ -603,7 +612,7 @@ class FrameDeclarationsMixin(object):
             )
 
         else:
-            frame_handle = code_identifier.replace("code_objects_", "frame_")
+            frame_handle = "frame_" + frame_code_name
 
             if self.frames_used > 1:
                 frame_handle += "_%d" % self.frames_used
@@ -789,6 +798,8 @@ class PythonModuleContext(
         "exception_keepers",
         "preserver_variable_declaration",
         "cleanup_names",
+        # TODO: Remove when isExperimental("new-code-objects") is becoming the
+        # standard.
         # CodeObjectsMixin
         "code_objects",
         # ReturnReleaseModeMixin
@@ -1139,6 +1150,8 @@ class PythonFunctionOutlineContext(
     def popCleanupScope(self):
         self.parent.popCleanupScope()
 
+    # TODO: Remove when isExperimental("new-code-objects") is becoming the
+    # standard.
     def getCodeObjectHandle(self, code_object):
         return self.parent.getCodeObjectHandle(code_object)
 
@@ -1175,8 +1188,8 @@ class PythonFunctionOutlineContext(
     def getFrameHandle(self):
         return self.parent.getFrameHandle()
 
-    def pushFrameHandle(self, code_identifier, is_light):
-        return self.parent.pushFrameHandle(code_identifier, is_light)
+    def pushFrameHandle(self, code_object_access_code, is_light):
+        return self.parent.pushFrameHandle(code_object_access_code, is_light)
 
     def popFrameHandle(self):
         return self.parent.popFrameHandle()

nuitka/code_generation/CoroutineCodes.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
 
 
 """ Code to generate and interact with compiled coroutine objects.
@@ -10,6 +10,7 @@ from .CodeHelpers import (
     generateStatementSequenceCode,
     withObjectCodeTemporaryAssignment,
 )
+from .CodeObjectCodes import getCodeObjectAccessCode
 from .Emission import SourceCodeCollector
 from .ErrorCodes import getErrorExitCode
 from .FunctionCodes import (
@@ -43,7 +44,6 @@ def getCoroutineObjectDeclCode(function_identifier, closure_variables):
         kw_defaults_name=None,
         annotations_name=None,
         closure_variables=closure_variables,
-        tstate=True,
     )
 
     return template_coroutine_object_maker % {
@@ -124,7 +124,6 @@ struct %(function_identifier)s_locals *coroutine_heap = \
         kw_defaults_name=None,
         annotations_name=None,
         closure_variables=closure_variables,
-        tstate=True,
     )
 
     return template_coroutine_object_body % {
@@ -145,8 +144,8 @@ struct %(function_identifier)s_locals *coroutine_heap = \
         "coroutine_qualname_obj": getFunctionQualnameObj(
             coroutine_object_body, context
         ),
-        "code_identifier": context.getCodeObjectHandle(
-            code_object=coroutine_object_body.getCodeObject()
+        "code_identifier": getCodeObjectAccessCode(
+            code_object=coroutine_object_body.getCodeObject(), context=context
         ),
         "closure_name": "closure" if closure_variables else "NULL",
         "closure_count": len(closure_variables),

nuitka/code_generation/CtypesCodes.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
 
 
 """ Code generation for ctypes module stuff. """

nuitka/code_generation/DictCodes.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
 
 
 """ Code generation for dictionaries.

nuitka/code_generation/Emission.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
 
 
 """ Emission of source code.

nuitka/code_generation/ErrorCodes.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
 
 
 """ Error codes

nuitka/code_generation/EvalCodes.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
 
 
 """ Eval/exec/execfile/compile built-in related codes. """

nuitka/code_generation/ExceptionCodes.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
 
 
 """ Exception handling.

nuitka/code_generation/ExpressionCTypeSelectionHelpers.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
 
 
 """ Module for helpers to select types for operation arguments.

nuitka/code_generation/ExpressionCodes.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
 
 
 """ Expression codes, side effects, or statements that are an unused expression.

nuitka/code_generation/FrameCodes.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
 
 
 """ Frame codes
@@ -11,6 +11,7 @@ from nuitka.PythonVersions import python_version
 from nuitka.utils.Jinja2 import renderTemplateFromString
 
 from .CodeHelpers import _generateStatementSequenceCode
+from .CodeObjectCodes import getCodeObjectAccessCode
 from .Emission import SourceCodeCollector
 from .ErrorCodes import getFrameVariableTypeDescriptionCode
 from .ExceptionCodes import getTracebackMakingIdentifier
@@ -69,7 +70,9 @@ def generateStatementsFrameCode(statement_sequence, emit, context):
     guard_mode = statement_sequence.getGuardMode()
 
     code_object = statement_sequence.getCodeObject()
-    code_identifier = context.getCodeObjectHandle(code_object=code_object)
+    code_object_access_code = getCodeObjectAccessCode(
+        code_object=code_object, context=context
+    )
 
     parent_exception_exit = context.getExceptionEscape()
 
@@ -79,7 +82,9 @@ def generateStatementsFrameCode(statement_sequence, emit, context):
         parent_exception_exit = context.allocateLabel("nested_frame_exit")
 
     # Allow stacking of frame handles.
-    context.pushFrameHandle(code_identifier, statement_sequence.hasStructureMember())
+    context.pushFrameHandle(
+        statement_sequence.getFrameCodeName(), statement_sequence.hasStructureMember()
+    )
 
     context.setExceptionEscape(context.allocateLabel("frame_exception_exit"))
 
@@ -127,9 +132,12 @@ def generateStatementsFrameCode(statement_sequence, emit, context):
         # TODO: This case should also care about "needs_preserve", as for
         # Python3 it is actually not a stub of empty code.
 
+        # TODO: Rename "code_identifier" to "code_object_access_code" in these
+        # functions and make it work with function call result properly and not
+        # have to be a variable name.
         getFrameGuardGeneratorCode(
             frame_node=statement_sequence,
-            code_identifier=code_identifier,
+            code_identifier=code_object_access_code,
             codes=local_emit.codes,
             parent_exception_exit=parent_exception_exit,
             frame_exception_exit=frame_exception_exit,
@@ -141,7 +149,7 @@ def generateStatementsFrameCode(statement_sequence, emit, context):
     elif guard_mode in ("full", "once"):
         getFrameGuardHeavyCode(
             frame_node=statement_sequence,
-            code_identifier=code_identifier,
+            code_identifier=code_object_access_code,
             parent_exception_exit=parent_exception_exit,
             parent_return_exit=parent_return_exit,
             frame_exception_exit=frame_exception_exit,
@@ -421,22 +429,23 @@ def getFrameGuardGeneratorCode(
 
     if frame_exception_exit is not None:
         emit(
-            template_frame_guard_generator_exception_handler
-            % {
-                "context_identifier": context_identifier,
-                "frame_identifier": frame_identifier,
-                "frame_cache_identifier": frame_cache_identifier,
-                "exception_state_name": exception_state_name,
-                "exception_lineno": exception_lineno,
-                "tb_making": getTracebackMakingIdentifier(
+            renderTemplateFromString(
+                template_frame_guard_generator_exception_handler,
+                context_identifier=context_identifier,
+                frame_identifier=frame_identifier,
+                frame_cache_identifier=frame_cache_identifier,
+                exception_state_name=exception_state_name,
+                exception_lineno=exception_lineno,
+                tb_making=getTracebackMakingIdentifier(
                     context=context, lineno_name=exception_lineno
                 ),
-                "attach_locals": indented(
+                attach_locals=indented(
                     getFrameAttachLocalsCode(context, frame_identifier)
                 ),
-                "frame_exception_exit": frame_exception_exit,
-                "parent_exception_exit": parent_exception_exit,
-            }
+                frame_exception_exit=frame_exception_exit,
+                parent_exception_exit=parent_exception_exit,
+                is_python3=python_version >= 0x300,
+            )
         )
 
     getLabelCode(no_exception_exit, emit)