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

nuitka/code_generation/templates_c/HelperSlotsLong.c.j2

@@ -1,20 +1,5 @@
-{#     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 #}
+
 {% from 'HelperSlotsCommon.c.j2' import goto_exit, constant_long_exit_target, constant_int_exit_target %}
 {% from 'HelperLongTools.c.j2' import declare_long_access with context %}
 {% macro long_slot(props, operator, nb_slot, target, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) %}
@@ -34,11 +19,12 @@
     {{ declare_long_access(right, operand2) }}
 
     if ({{ left.getLongValueDigitCountExpression("operand1")}} <= 1 && {{ right.getLongValueDigitCountExpression("operand2")}} <= 1) {
-        long r = {{ left.getLongValueMediumValueExpression("operand1") }} + {{ right.getLongValueMediumValueExpression("operand2") }};
+        {# TODO: Double digits are not handled efficiently for Python3.12 #}
+        long r = (long)({{ left.getLongValueMediumValueExpression("operand1") }} + {{ right.getLongValueMediumValueExpression("operand2") }});
 
 {% if target == None and left.hasReferenceCounting() %}
         if (Py_REFCNT({{operand1}}) == 1) {
-            Nuitka_LongUpdateFromCLong(&{{operand1}}, r);
+            Nuitka_LongUpdateFromCLong(&{{operand1}}, (long)r);
             {{ goto_exit(props, "exit_result_ok") }}
         } else {
             PyObject *obj = Nuitka_LongFromCLong(r);
@@ -60,7 +46,7 @@
         if (a_negative) {
             if (b_negative) {
                 {{ operand1 }} = _Nuitka_LongAddInplaceDigits({{ operand1 }}, b_digits, b_digit_count);
-                Py_SET_SIZE({{ operand1 }}, -Py_ABS(Py_SIZE({{ operand1 }})));
+                Nuitka_LongSetSignNegative({{ operand1 }});
             } else {
                 {# Reversed operands order means sign inversion. #}
                 {{ operand1 }} = _Nuitka_LongSubInplaceDigits({{ operand1 }}, b_digits, b_digit_count, -1);
@@ -90,7 +76,7 @@
         if (a_negative) {
             if (b_negative) {
                 z = _Nuitka_LongAddDigits(a_digits, a_digit_count, b_digits, b_digit_count);
-                Py_SET_SIZE(z, -(Py_SIZE(z)));
+                Nuitka_LongFlipSign(z);
             } else {
                 {# Reversed operands order. #}
                 z = _Nuitka_LongSubDigits(b_digits, b_digit_count, a_digits, a_digit_count);
@@ -110,7 +96,8 @@
     {{ declare_long_access(right, operand2) }}
 
     if ({{ left.getLongValueDigitCountExpression("operand1")}} <= 1 && {{ right.getLongValueDigitCountExpression("operand2")}} <= 1) {
-        long r = {{ left.getLongValueMediumValueExpression("operand1") }} - {{ right.getLongValueMediumValueExpression("operand2") }};
+        {# TODO: Double digits are not handled efficiently for Python3.12 #}
+        long r = (long)({{ left.getLongValueMediumValueExpression("operand1") }} - {{ right.getLongValueMediumValueExpression("operand2") }});
 
 {% if target == None and left.hasReferenceCounting() %}
         if (Py_REFCNT({{operand1}}) == 1) {
@@ -139,7 +126,7 @@
                 {{ operand1 }} = _Nuitka_LongSubInplaceDigits({{ operand1 }}, b_digits, b_digit_count, -1);
             } else {
                 {{ operand1 }} = _Nuitka_LongAddInplaceDigits({{ operand1 }}, b_digits, b_digit_count);
-                Py_SET_SIZE({{ operand1 }}, -Py_ABS(Py_SIZE({{ operand1 }})));
+                Nuitka_LongSetSignNegative({{ operand1 }});
             }
         } else {
             if (b_negative) {
@@ -170,7 +157,7 @@
                 z = _Nuitka_LongAddDigits(a_digits, a_digit_count, b_digits, b_digit_count);
             }
 
-            Py_SET_SIZE(z, -(Py_SIZE(z)));
+            Nuitka_LongFlipSign(z);
         } else {
             if (b_negative) {
                 z = _Nuitka_LongAddDigits(a_digits, a_digit_count, b_digits, b_digit_count);
@@ -225,3 +212,18 @@ exit_result_ok_clong:
 {% endif %}
 
 {% endmacro %}
+
+{#     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/templates_c/HelperSlotsSet.c.j2

@@ -1,20 +1,5 @@
-{#     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 #}
+
 {% from 'HelperSlotsCommon.c.j2' import goto_exit %}
 
 {% macro set_slot(props, operator, nb_slot, nb_inplace_slot, target, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) %}
@@ -45,3 +30,18 @@ exit_result_object:
     {{ goto_exit(props, exit_result_ok) }}
 
 {% endmacro %}
+
+{#     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/templates_c/HelperSlotsStr.c.j2

@@ -1,20 +1,5 @@
-{#     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 #}
+
 {% from 'HelperSlotsCommon.c.j2' import goto_exit %}
 
 {% macro str_slot(props, operator, nb_slot, target, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) %}
@@ -53,3 +38,18 @@ exit_result_object:
     {{ goto_exit(props, exit_result_ok) }}
 
 {% endmacro %}
+
+{#     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/templates_c/HelperSlotsTuple.c.j2

@@ -1,20 +1,5 @@
-{#     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 #}
+
 {% from 'HelperSlotsCommon.c.j2' import goto_exit %}
 
 {% macro tuple_slot(props, operator, nb_slot, target, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) %}
@@ -24,7 +9,10 @@
     {# TODO: Could and should in-line and specialize this per slot too. #}
 {% if nb_slot == "nb_add" %}
 {% if left.type_name == "tuple" == right.type_name %}
-    PyObject *x = TUPLE_CONCAT({{ operand1 }}, {{ operand2 }});
+    // TODO: Have this more globally passed in
+    PyThreadState *tstate = PyThreadState_GET();
+
+    PyObject *x = TUPLE_CONCAT(tstate, {{ operand1 }}, {{ operand2 }});
 {% else %}
     PyObject *x = {{ left.getSlotCallExpression("sq_concat", "PyTuple_Type.tp_as_sequence->sq_concat", operand1, operand2) }};
 {% endif %}
@@ -53,3 +41,18 @@ exit_result_object:
     {{ goto_exit(props, exit_result_ok) }}
 
 {% endmacro %}
+
+{#     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/templates_c/HelperSlotsUnicode.c.j2

@@ -1,20 +1,5 @@
-{#     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 #}
+
 {% from 'HelperSlotsCommon.c.j2' import goto_exit %}
 
 {% macro unicode_slot(props, operator, nb_slot, target, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) %}
@@ -60,3 +45,18 @@ exit_result_object:
     {{ goto_exit(props, exit_result_ok) }}
 
 {% endmacro %}
+
+{#     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/containers/Namedtuples.py

@@ -1,27 +1,12 @@
-#     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
+
+
 """ This module is only an abstraction of namedtuple.
 
 It works around bugs present in some version of Python, and provides extra
 methods like "asDict".
 """
 
-
 from collections import namedtuple
 
 
@@ -42,3 +27,19 @@ def makeNamedtupleClass(name, element_names):
     DynamicNamedtuple.__name__ = name
 
     return DynamicNamedtuple
+
+
+#     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/containers/OrderedSetsFallback.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
+
+
 """ This module is only an abstraction of OrderedSet which is not present in
 Python at all.
 
@@ -135,3 +121,19 @@ class OrderedSet(MutableSet):
             return count - 1
 
         return None
+
+
+#     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/containers/__init__.py

@@ -1,5 +1,8 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Dummy file to make this directory a package. """
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #
@@ -14,5 +17,3 @@
 #     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.
-#
-""" Dummy file to make this directory a package. """

nuitka/distutils/Build.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
+
+
 """ Nuitka python -m build integration """
 
 import contextlib
@@ -53,9 +39,24 @@ prepare_metadata_for_build_wheel = _BACKEND.prepare_metadata_for_build_wheel
 build_wheel = _BACKEND.build_wheel
 build_sdist = _BACKEND.build_sdist
 
-LEGACY_EDITABLE = getattr(setuptools.build_meta, "LEGACY_EDITABLE")
+LEGACY_EDITABLE = getattr(setuptools.build_meta, "LEGACY_EDITABLE", False)
 
 if not LEGACY_EDITABLE:
     get_requires_for_build_editable = _BACKEND.get_requires_for_build_editable
     prepare_metadata_for_build_editable = _BACKEND.prepare_metadata_for_build_editable
     build_editable = _BACKEND.build_editable
+
+#     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/distutils/DistutilCommands.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
+
+
 """ Nuitka distutils integration.
 
 """
@@ -34,6 +20,7 @@ from nuitka.importing.Importing import (
     flushImportCache,
     locateModule,
 )
+from nuitka.PythonVersions import python_version
 from nuitka.Tracing import wheel_logger
 from nuitka.utils.Execution import check_call
 from nuitka.utils.FileOperations import deleteFile, getFileList, renameFile
@@ -306,13 +293,17 @@ class build(distutils.command.build.build):
             else:
                 command.append("--include-module=%s" % include_package_name)
 
-            toml_filename = os.environ.get("NUITKA_TOML_FILE")
+            toml_filename = os.getenv("NUITKA_TOML_FILE")
             if toml_filename:
                 # Import toml parser like "build" module does.
-                try:
-                    from tomli import loads as toml_loads
-                except ImportError:
-                    from toml import loads as toml_loads
+                if python_version >= 0x3B0:
+                    # stdlib only for 3.11, pylint: disable=I0021,import-error
+                    from tomllib import loads as toml_loads
+                else:
+                    try:
+                        from tomli import loads as toml_loads
+                    except ImportError:
+                        from toml import loads as toml_loads
 
                 # Cannot use FileOperations.getFileContents() here, because of non-Nuitka process
                 # pylint: disable=unspecified-encoding
@@ -323,6 +314,11 @@ class build(distutils.command.build.build):
                 for option, value in toml_options.get("nuitka", {}).items():
                     command.extend(self._parseOptionsEntry(option, value))
 
+                for option, value in (
+                    toml_options.get("tool", {}).get("nuitka", {}).items()
+                ):
+                    command.extend(self._parseOptionsEntry(option, value))
+
             # Process any extra options from setuptools
             if "nuitka" in self.distribution.command_options:
                 for option, value in self.distribution.command_options[
@@ -379,7 +375,6 @@ class bdist_nuitka(wheel.bdist_wheel.bdist_wheel):
         wheel.bdist_wheel.bdist_wheel.finalize_options(self)
         # Force module to use correct platform in name
         self.root_is_pure = False
-        self.plat_name_supplied = self.plat_name is not None
 
     def write_wheelfile(self, wheelfile_base, generator=None):
         if generator is None:
@@ -390,3 +385,19 @@ class bdist_nuitka(wheel.bdist_wheel.bdist_wheel):
         wheel.bdist_wheel.bdist_wheel.write_wheelfile(
             self, wheelfile_base=wheelfile_base, generator=generator
         )
+
+
+#     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/distutils/__init__.py

@@ -1,5 +1,8 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Dummy file to make this directory a package. """
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #
@@ -14,5 +17,3 @@
 #     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.
-#
-""" Dummy file to make this directory a package. """

nuitka/finalizations/Finalization.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
+
+
 """ Finalizations. Last steps directly before code creation is called.
 
 Here the final tasks are executed. Things normally volatile during optimization
@@ -22,6 +8,7 @@ can be computed here, so the code generation can be quick and doesn't have to
 check it many times.
 
 """
+
 from nuitka.tree import Operations
 
 from .FinalizeMarkups import FinalizeMarkups
@@ -30,3 +17,19 @@ from .FinalizeMarkups import FinalizeMarkups
 def prepareCodeGeneration(tree):
     visitor = FinalizeMarkups()
     Operations.visitTree(tree, visitor)
+
+
+#     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.