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

nuitka/code_generation/FunctionCodes.py

@@ -1,25 +1,10 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Code to generate and interact with compiled function objects.
 
 """
 
-
 from nuitka.PythonVersions import python_version
 from nuitka.Tracing import general
 
@@ -213,8 +198,10 @@ def getFunctionMakerCode(
         "constant_return_code": indented(constant_return_code),
     }
 
-    # TODO: Make it optional.
-    context.addFunctionCreationInfo(function_impl_identifier)
+    # TODO: Make it optional, only dill plugin really uses that table to
+    # transport the C code implementation pointers.
+    if function_impl_identifier != "NULL":
+        context.addFunctionCreationInfo(function_impl_identifier)
 
     return result
 
@@ -675,17 +662,13 @@ def _getFunctionCode(
 
     if needs_exception_exit:
         (
-            exception_type,
-            exception_value,
-            exception_tb,
+            exception_state_name,
             _exception_lineno,
         ) = context.variable_storage.getExceptionVariableDescriptions()
 
         function_exit += template_function_exception_exit % {
             "function_cleanup": indented(function_cleanup),
-            "exception_type": exception_type,
-            "exception_value": exception_value,
-            "exception_tb": exception_tb,
+            "exception_state_name": exception_state_name,
         }
 
     if context.hasTempName("return_value"):
@@ -792,7 +775,7 @@ def generateFunctionOutlineCode(to_name, expression, emit, context):
             )
 
             if variable_declaration.getCType() is CTypeCellObject:
-                emit("%s = Nuitka_Cell_Empty();" % variable_declaration)
+                emit("%s = Nuitka_Cell_NewEmpty();" % variable_declaration)
 
     # Need to set return target, to assign to_name from.
 
@@ -863,3 +846,19 @@ def generateFunctionErrorStrCode(to_name, expression, emit, context):
         emit=emit,
         context=context,
     )
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/code_generation/GeneratorCodes.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Code to generate and interact with compiled function objects.
 
 """
@@ -96,17 +82,13 @@ def getGeneratorObjectCode(
 
     if needs_exception_exit:
         (
-            exception_type,
-            exception_value,
-            exception_tb,
+            exception_state_name,
             _exception_lineno,
         ) = context.variable_storage.getExceptionVariableDescriptions()
 
         generator_exit = template_generator_exception_exit % {
             "function_cleanup": indented(function_cleanup),
-            "exception_type": exception_type,
-            "exception_value": exception_value,
-            "exception_tb": exception_tb,
+            "exception_state_name": exception_state_name,
         }
     else:
         generator_exit = template_generator_noexception_exit % {
@@ -115,9 +97,10 @@ def getGeneratorObjectCode(
 
     if needs_generator_return:
         generator_exit += template_generator_return_exit % {
-            "return_value": context.getReturnValueName()
-            if python_version >= 0x300
-            else None
+            "return_value": (
+                context.getReturnValueName() if python_version >= 0x300 else None
+            ),
+            "function_cleanup": indented(function_cleanup),
         }
 
     function_locals = context.variable_storage.makeCFunctionLevelDeclarations()
@@ -218,3 +201,19 @@ def generateMakeGeneratorObjectCode(to_name, expression, emit, context):
         )
 
     context.addCleanupTempName(to_name)
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/code_generation/GlobalConstants.py

@@ -1,26 +1,13 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Global constant values.
 
 """
 
 from nuitka import Options
 from nuitka.__past__ import long
+from nuitka.plugins.Plugins import Plugins
 from nuitka.PythonVersions import python_version
 from nuitka.utils.Utils import isWin32Windows
 
@@ -63,6 +50,7 @@ def getConstantDefaultPopulation():
         "__package__",
         "__metaclass__",
         "__abstractmethods__",
+        "__closure__",
         # TODO: For PyObject_IsSubClass one day
         # "__subclasscheck__",
         "__dict__",
@@ -94,6 +82,7 @@ def getConstantDefaultPopulation():
         "staticmethod",
         "classmethod",
         "keys",
+        "get",
         # Arguments of __import__ built-in used in helper code.
         "name",
         "globals",
@@ -103,21 +92,30 @@ def getConstantDefaultPopulation():
         # Meta path based loader.
         "read",
         "rb",
+        "w",
+        "b",
         # File handling
         "/",
         "\\",
         "path",
         "basename",
+        "dirname",
         "abspath",
         "isabs",
+        "normpath",
         "exists",
         "isdir",
         "isfile",
         "listdir",
+        "stat",
+        "close",
     ]
 
+    if python_version < 0x300:
+        result += ("lstat",)
+
     # Pickling of instance methods.
-    if python_version < 0x340:
+    if python_version < 0x300:
         result += ("__newobj__",)
     else:
         result += ("getattr",)
@@ -136,21 +134,22 @@ def getConstantDefaultPopulation():
     # "__package__" parsing
     result.append(".")
 
+    # For star imports checking private symbols
+    result.append("_")
+    if python_version < 0x300:
+        result.append("_")
+
     if python_version >= 0x300:
         # Modules have that attribute starting with Python3
         result.append("__loader__")
 
-    if python_version >= 0x340:
-        result.append(
-            # YIELD_FROM uses this starting 3.4, with 3.3 other code is used.
-            "send"
-        )
+        # YIELD_FROM uses this
+        result.append("send")
 
     if python_version >= 0x300:
         result += (
             # YIELD_FROM uses this
             "throw",
-            "close",
         )
 
     if python_version < 0x300:
@@ -179,7 +178,7 @@ def getConstantDefaultPopulation():
         if python_version < 0x300:
             result.append("long")
 
-    if python_version >= 0x340:
+    if python_version >= 0x300:
         # Work with the __spec__ module attribute.
         result += ("__spec__", "_initializing", "parent")
 
@@ -187,6 +186,10 @@ def getConstantDefaultPopulation():
         # Patching the types module.
         result.append("types")
 
+        # Converting module names
+        result.append("ascii")
+        result.append("punycode")
+
     if not Options.shallMakeModule():
         result.append("__main__")
 
@@ -215,7 +218,30 @@ def getConstantDefaultPopulation():
         result.append("__aenter__")
         result.append("__aexit__")
 
+        # Exception group split method call
+        result.append("split")
+
     if isWin32Windows():
         result.append("fileno")
 
+    for value in Plugins.getExtraConstantDefaultPopulation():
+        if value not in result:
+            result.append(value)
+
     return result
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/code_generation/GlobalsLocalsCodes.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Code generation for locals and globals handling.
 
 This also includes writing back to locals for exec statements.
@@ -36,7 +22,7 @@ from .templates.CodeTemplatesVariables import (
 )
 from .VariableCodes import (
     getLocalVariableDeclaration,
-    getVariableReferenceCode,
+    getNonModuleVariableReferenceCode,
 )
 from .VariableDeclarations import VariableDeclaration
 
@@ -76,7 +62,7 @@ def generateBuiltinLocalsCode(to_name, expression, emit, context):
             # TODO: Creation is not needed for classes.
             emit(
                 """\
-if (%(locals_dict)s == NULL) %(locals_dict)s = MAKE_DICT_EMPTY();
+if (%(locals_dict)s == NULL) %(locals_dict)s = MAKE_DICT_EMPTY(tstate);
 %(to_name)s = %(locals_dict)s;
 Py_INCREF(%(to_name)s);"""
                 % {"to_name": value_name, "locals_dict": locals_declaration}
@@ -85,7 +71,7 @@ Py_INCREF(%(to_name)s);"""
 
             initial = False
         else:
-            emit("%s = MAKE_DICT_EMPTY();" % (to_name,))
+            emit("%s = MAKE_DICT_EMPTY(tstate);" % (to_name,))
 
             context.addCleanupTempName(value_name)
 
@@ -132,7 +118,7 @@ def _getVariableDictUpdateCode(
 
     access_code = SourceCodeCollector()
 
-    getVariableReferenceCode(
+    getNonModuleVariableReferenceCode(
         to_name=VariableDeclaration("PyObject *", "value", None, None),
         variable=variable,
         variable_trace=variable_trace,
@@ -207,3 +193,19 @@ def generateBuiltinVarsCode(to_name, expression, emit, context):
         emit=emit,
         context=context,
     )
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/code_generation/IdCodes.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Codes for id and hash
 
 """
@@ -49,3 +35,19 @@ def generateBuiltinHashCode(to_name, expression, emit, context):
         emit=emit,
         context=context,
     )
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/code_generation/ImportCodes.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Import related codes.
 
 That is import as expression, and star import.
@@ -22,7 +8,7 @@ That is import as expression, and star import.
 
 import os
 
-from nuitka.nodes.ImportNodes import hard_modules
+from nuitka.HardImportRegistry import isHardModule, isHardModuleDynamic
 from nuitka.nodes.LocalsScopes import GlobalsDictHandle
 from nuitka.PythonVersions import python_version
 from nuitka.utils.Jinja2 import renderTemplateFromString
@@ -33,7 +19,7 @@ from .CodeHelpers import (
     generateExpressionCode,
     withObjectCodeTemporaryAssignment,
 )
-from .ErrorCodes import getErrorExitBoolCode, getErrorExitCode, getReleaseCode
+from .ErrorCodes import getErrorExitBoolCode, getErrorExitCode
 from .LineNumberCodes import emitLineNumberUpdateCode
 from .ModuleCodes import getModuleAccessCode
 
@@ -131,7 +117,6 @@ def _getBuiltinImportCode(
 
 
 def generateImportModuleFixedCode(to_name, expression, emit, context):
-    module_name = expression.getModuleName()
     needs_check = expression.mayRaiseException(BaseException)
 
     if needs_check:
@@ -141,8 +126,12 @@ def generateImportModuleFixedCode(to_name, expression, emit, context):
         to_name, "imported_value", expression, emit, context
     ) as value_name:
         emit(
-            """%s = IMPORT_MODULE1(tstate, %s);"""
-            % (value_name, context.getConstantCode(module_name.asString()))
+            """%s = IMPORT_MODULE_FIXED(tstate, %s, %s);"""
+            % (
+                value_name,
+                context.getConstantCode(expression.getModuleName().asString()),
+                context.getConstantCode(expression.getValueName().asString()),
+            )
         )
 
         getErrorExitCode(
@@ -151,24 +140,6 @@ def generateImportModuleFixedCode(to_name, expression, emit, context):
 
         context.addCleanupTempName(value_name)
 
-        # IMPORT_MODULE1 doesn't give the child module if one is imported.
-        if "." in module_name:
-            getReleaseCode(value_name, emit, context)
-
-            emit(
-                """%s = Nuitka_GetModule(tstate, %s);"""
-                % (value_name, context.getConstantCode(module_name.asString()))
-            )
-
-            getErrorExitCode(
-                check_name=value_name,
-                needs_check=needs_check,
-                emit=emit,
-                context=context,
-            )
-
-            context.addCleanupTempName(value_name)
-
 
 def getImportModuleHardCodeName(module_name):
     """Encoding hard module name for code name."""
@@ -190,22 +161,44 @@ def generateImportModuleHardCode(to_name, expression, emit, context):
     with withObjectCodeTemporaryAssignment(
         to_name, "imported_value", expression, emit, context
     ) as value_name:
+        import_gives_ref, module_getter_code = getImportHardModuleGetterCode(
+            module_name=imported_module_name, context=context
+        )
+
         if imported_module_name == module_value_name:
-            emit(
-                """%s = %s();"""
-                % (value_name, getImportModuleHardCodeName(imported_module_name))
-            )
+            emit("""%s = %s;""" % (value_name, module_getter_code))
         else:
-            emit("""%s();""" % getImportModuleHardCodeName(imported_module_name))
+            import_gives_ref, module_getter_code2 = getImportHardModuleGetterCode(
+                module_name=module_value_name, context=context
+            )
+
             emit(
-                """%s = %s();"""
-                % (value_name, getImportModuleHardCodeName(module_value_name))
+                renderTemplateFromString(
+                    r"""
+{% if import_gives_ref %}
+{
+    PyObject *hard_module = {{module_getter_code1}};
+    Py_DECREF(hard_module);
+}
+{% else %}
+{{module_getter_code1}};
+{% endif %}
+{{value_name}} = {{module_getter_code2}};
+""",
+                    value_name=value_name,
+                    module_getter_code1=module_getter_code,
+                    module_getter_code2=module_getter_code2,
+                    import_gives_ref=import_gives_ref,
+                )
             )
 
         getErrorExitCode(
             check_name=value_name, needs_check=needs_check, emit=emit, context=context
         )
 
+        if import_gives_ref:
+            context.addCleanupTempName(value_name)
+
 
 def generateConstantSysVersionInfoCode(to_name, expression, emit, context):
     with withObjectCodeTemporaryAssignment(
@@ -218,37 +211,68 @@ def generateConstantSysVersionInfoCode(to_name, expression, emit, context):
     )
 
 
+def getImportHardModuleGetterCode(module_name, context):
+    if isHardModuleDynamic(module_name):
+        module_name_code = context.getConstantCode(module_name.asString())
+
+        module_getter_code = "IMPORT_MODULE_FIXED(tstate, %s, %s)" % (
+            module_name_code,
+            module_name_code,
+        )
+        gives_ref = True
+    else:
+        module_getter_code = "%s()" % getImportModuleHardCodeName(module_name)
+        gives_ref = False
+
+    return gives_ref, module_getter_code
+
+
 def getImportModuleNameHardCode(
     to_name, module_name, import_name, needs_check, emit, context
 ):
+    module_name = ModuleName(module_name)
+
     if module_name == "sys":
         emit("""%s = Nuitka_SysGetObject("%s");""" % (to_name, import_name))
         needs_release = False
-    elif module_name in hard_modules:
+    elif isHardModule(module_name):
         if needs_check:
             emitLineNumberUpdateCode(expression=None, emit=emit, context=context)
 
+        import_gives_ref, module_getter_code = getImportHardModuleGetterCode(
+            module_name=module_name, context=context
+        )
+
         emit(
             renderTemplateFromString(
                 r"""
 {
-    PyObject *hard_module = {{module_code_name}}();
+    PyObject *hard_module = {{module_getter_code}};
 {% if needs_check %}
     if (likely(hard_module != NULL)) {
         {{to_name}} = LOOKUP_ATTRIBUTE(tstate, hard_module, {{import_name}});
+
+{% if import_gives_ref %}
+        Py_DECREF(hard_module);
+{% endif %}
+
     } else {
         {{to_name}} = NULL;
     }
 {% else %}
     {{to_name}} = LOOKUP_ATTRIBUTE(tstate, hard_module, {{import_name}});
+{% if import_gives_ref %}
+    Py_DECREF(hard_module);
+{% endif %}
 {% endif %}
 }
 """,
                 to_name=to_name,
                 module_name=str(module_name),
-                module_code_name=getImportModuleHardCodeName(module_name),
+                module_getter_code=module_getter_code,
                 import_name=context.getConstantCode(import_name),
                 needs_check=needs_check,
+                import_gives_ref=import_gives_ref,
             )
         )
 
@@ -426,3 +450,19 @@ if (PyModule_Check(%(from_arg_name)s)) {
         )
 
         context.addCleanupTempName(value_name)
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.