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

nuitka/tree/ReformulationYieldExpressions.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
+
+
 """ Reformulation of "yield" and "yield from" expressions.
 
 Consult the Developer Manual for information. TODO: Add ability to sync
@@ -29,7 +15,7 @@ from nuitka.nodes.CoroutineNodes import ExpressionAsyncWait
 from nuitka.nodes.YieldNodes import (
     ExpressionYield,
     ExpressionYieldFrom,
-    ExpressionYieldFromWaitable,
+    ExpressionYieldFromAwaitable,
 )
 from nuitka.PythonVersions import python_version
 
@@ -37,17 +23,35 @@ from .SyntaxErrors import raiseSyntaxError
 from .TreeHelpers import buildNode
 
 
+def _getErrorMessageYieldFromOutsideFunction():
+    # Need to use "exec" to detect the syntax error, pylint: disable=W0122
+
+    try:
+        exec("""yield from ()""")
+    except SyntaxError as e:
+        if "yield from" in str(e):
+            return "yield from"
+        else:
+            return "yield"
+
+
 def _checkInsideGenerator(construct_name, provider, node, source_ref):
+
     if provider.isCompiledPythonModule():
+        # Bug compatibility
+        if construct_name == "yield from":
+            construct_error_name = _getErrorMessageYieldFromOutsideFunction()
+        else:
+            construct_error_name = construct_name
+
         raiseSyntaxError(
-            "'%s' outside function"
-            % (construct_name if construct_name == "await" else "yield"),
+            "'%s' outside function" % construct_error_name,
             source_ref.atColumnNumber(node.col_offset),
         )
 
-    # This yield is forbidden in 3.5, but allowed in 3.6, but yield_from
+    # This yield is forbidden in 3.5, but allowed in 3.6, but "yield from"
     # is neither.
-    if provider.isExpressionAsyncgenObjectBody() and construct_name == "yield_from":
+    if provider.isExpressionAsyncgenObjectBody() and construct_name == "yield from":
         raiseSyntaxError(
             "'%s' inside async function"
             % ("yield" if node.__class__ is ast.Yield else "yield from",),
@@ -94,7 +98,7 @@ def buildYieldNode(provider, node, source_ref):
 def buildYieldFromNode(provider, node, source_ref):
     assert python_version >= 0x300
 
-    _checkInsideGenerator("yield_from", provider, node, source_ref)
+    _checkInsideGenerator("yield from", provider, node, source_ref)
 
     return ExpressionYieldFrom(
         expression=buildNode(provider, node.value, source_ref), source_ref=source_ref
@@ -104,10 +108,26 @@ def buildYieldFromNode(provider, node, source_ref):
 def buildAwaitNode(provider, node, source_ref):
     _checkInsideGenerator("await", provider, node, source_ref)
 
-    return ExpressionYieldFromWaitable(
+    return ExpressionYieldFromAwaitable(
         expression=ExpressionAsyncWait(
             expression=buildNode(provider, node.value, source_ref),
             source_ref=source_ref,
         ),
         source_ref=source_ref,
     )
+
+
+#     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/tree/SourceHandling.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
+
+
 """ Read/write source code from files.
 
 Reading is tremendously more complex than one might think, due to encoding
@@ -31,10 +17,7 @@ from nuitka.containers.OrderedSets import OrderedSet
 from nuitka.plugins.Plugins import Plugins
 from nuitka.PythonVersions import python_version, python_version_str
 from nuitka.Tracing import general, my_print
-from nuitka.utils.FileOperations import (
-    getFileContentByLine,
-    putTextFileContents,
-)
+from nuitka.utils.FileOperations import putTextFileContents
 from nuitka.utils.Shebang import getShebangFromSource, parseShebang
 from nuitka.utils.Utils import isWin32OrPosixWindows
 
@@ -174,7 +157,20 @@ def getSourceCodeDiff(source_code, source_code_modified):
     return list(diff)
 
 
-def readSourceCodeFromFilenameWithInformation(module_name, source_filename):
+_source_code_cache = {}
+
+
+def readSourceCodeFromFilenameWithInformation(
+    module_name, source_filename, pre_load=False
+):
+    key = (module_name, source_filename)
+
+    if key in _source_code_cache:
+        if pre_load:
+            return _source_code_cache[key]
+        else:
+            return _source_code_cache.pop(key)
+
     if python_version < 0x300:
         source_code = _readSourceCodeFromFilename2(source_filename)
     else:
@@ -184,13 +180,19 @@ def readSourceCodeFromFilenameWithInformation(module_name, source_filename):
     # module and doesn't want any changes from plugins in that case.
     if module_name is not None:
         source_code_modified, contributing_plugins = Plugins.onModuleSourceCode(
-            module_name=module_name, source_code=source_code
+            module_name=module_name,
+            source_filename=source_filename,
+            source_code=source_code,
         )
     else:
         source_code_modified = source_code
         contributing_plugins = ()
 
-    if Options.shallShowSourceModifications() and source_code_modified != source_code:
+    if (
+        module_name is not None
+        and Options.shallShowSourceModifications(module_name)
+        and source_code_modified != source_code
+    ):
         source_diff = getSourceCodeDiff(source_code, source_code_modified)
 
         if source_diff:
@@ -198,12 +200,19 @@ def readSourceCodeFromFilenameWithInformation(module_name, source_filename):
             for line in source_diff:
                 my_print(line, end="\n" if not line.startswith("---") else "")
 
-    return source_code_modified, source_code, contributing_plugins
+    result = source_code_modified, source_code, contributing_plugins
+
+    if pre_load:
+        _source_code_cache[key] = result
 
+    return result
 
-def readSourceCodeFromFilename(module_name, source_filename):
+
+def readSourceCodeFromFilename(module_name, source_filename, pre_load=False):
     return readSourceCodeFromFilenameWithInformation(
-        module_name=module_name, source_filename=source_filename
+        module_name=module_name,
+        source_filename=source_filename,
+        pre_load=pre_load,
     )[0]
 
 
@@ -255,6 +264,10 @@ def checkPythonVersionFromCode(source_code):
             result = 0x3B0 > python_version >= 0x3A0
         elif basename == "python3.11":
             result = 0x3C0 > python_version >= 0x3B0
+        elif basename == "python3.12":
+            result = 0x3D0 > python_version >= 0x3C0
+        elif basename == "python3.13":
+            result = 0x3E0 > python_version >= 0x3D0
         else:
             result = None
 
@@ -274,6 +287,7 @@ That will make use the correct Python version for Nuitka.
 
 
 def readSourceLine(source_ref):
+    """Read a single source line, mainly for use in error reporting only."""
     import linecache
 
     return linecache.getline(
@@ -281,6 +295,13 @@ def readSourceLine(source_ref):
     )
 
 
+def readSourceLines(source_ref):
+    """Read a source lines with linecache, for use with cached function source finding."""
+    import linecache
+
+    return linecache.getlines(source_ref.filename)
+
+
 def writeSourceCode(filename, source_code):
     # Prevent accidental overwriting. When this happens the collision detection
     # or something else has failed.
@@ -301,7 +322,14 @@ def parsePyIFile(module_name, pyi_filename):
     in_import_part = ""
     in_quote = None
 
-    for line_number, line in enumerate(getFileContentByLine(pyi_filename), start=1):
+    pyi_contents = readSourceCodeFromFilename(
+        # Do not pass module name, or else plugins modify it, which they
+        # should not.
+        module_name=None,
+        source_filename=pyi_filename,
+    )
+
+    for line in pyi_contents.splitlines():
         line = line.strip()
 
         if in_quote:
@@ -326,7 +354,8 @@ def parsePyIFile(module_name, pyi_filename):
             elif line.startswith("from "):
                 parts = line.split(None, 3)
                 assert parts[0] == "from"
-                assert parts[2] == "import", (line, pyi_filename, line_number)
+                if parts[2] != "import":
+                    continue
 
                 origin_name = parts[1]
 
@@ -345,11 +374,11 @@ def parsePyIFile(module_name, pyi_filename):
                     if dot_count > 0:
                         if origin_name:
                             origin_name = module_name.getRelativePackageName(
-                                level=dot_count + 1
+                                level=dot_count - 1
                             ).getChildNamed(origin_name)
                         else:
                             origin_name = module_name.getRelativePackageName(
-                                level=dot_count + 1
+                                level=dot_count - 1
                             )
 
                 if origin_name != module_name:
@@ -390,3 +419,19 @@ def parsePyIFile(module_name, pyi_filename):
                     pyi_deps.add(in_import_part + "." + name)
 
     return pyi_deps
+
+
+#     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/tree/SyntaxErrors.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
+
+
 """ Handling of syntax errors.
 
 Format SyntaxError/IndentationError exception for output, as well as
@@ -139,3 +125,19 @@ def raiseSyntaxError(reason, source_ref, display_file=True, display_line=True):
     exc.generated_by_nuitka = True
 
     raise exc
+
+
+#     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/tree/TreeHelpers.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
+
+
 """ Helper functions for parsing the AST nodes and building the Nuitka node tree.
 
 """
@@ -76,6 +62,9 @@ def extractDocFromBody(node):
         if Options.hasPythonFlagNoDocStrings():
             doc = None
 
+    if doc is not None and python_version >= 0x3D0:
+        doc = doc.lstrip()
+
     return body, doc
 
 
@@ -142,7 +131,7 @@ def detectFunctionBodyKind(nodes, start_value=None):
             for name, field in ast.iter_fields(node):
                 if name in ("name", "body"):
                     pass
-                elif name in ("bases", "decorator_list", "keywords"):
+                elif name in ("bases", "decorator_list", "keywords", "type_params"):
                     for child in field:
                         _check(child)
                 elif name == "starargs":
@@ -159,7 +148,7 @@ def detectFunctionBodyKind(nodes, start_value=None):
             for name, field in ast.iter_fields(node):
                 if name in ("name", "body"):
                     pass
-                elif name in ("bases", "decorator_list"):
+                elif name in ("bases", "decorator_list", "type_params"):
                     for child in field:
                         _check(child)
                 elif name == "args":
@@ -211,7 +200,10 @@ def detectFunctionBodyKind(nodes, start_value=None):
                 if name in ("name", "body", "comparators"):
                     pass
                 elif name == "generators":
-                    _check(field[0].iter)
+                    if python_version < 0x3B0:
+                        _check(field[0].iter)
+                    else:
+                        _check(field[0])
                 elif name in ("body", "elt"):
                     _check(field)
                 else:
@@ -302,6 +294,8 @@ def setBuildingDispatchers(path_args3, path_args2, path_args1):
 
 
 def buildNode(provider, node, source_ref, allow_none=False):
+    # too many exception handlers, pylint: disable=too-many-branches
+
     if node is None and allow_none:
         return None
 
@@ -341,6 +335,9 @@ def buildNode(provider, node, source_ref, allow_none=False):
         # we got interrupted.
         optimization_logger.info("Interrupted at '%s'." % source_ref)
         raise
+    except SystemExit:
+        optimization_logger.warning("Problem at '%s'." % source_ref.getAsString())
+        raise
     except:
         optimization_logger.warning(
             "Problem at '%s' with %s." % (source_ref.getAsString(), ast.dump(node))
@@ -691,3 +688,19 @@ def popBuildContext():
 
 def getBuildContext():
     return build_contexts[-1]
+
+
+#     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/tree/VariableClosure.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
+
+
 """ Variable closure taking.
 
 This is the completion of variable object completion. The variables were not
@@ -42,7 +28,6 @@ from nuitka.nodes.VariableRefNodes import (
     ExpressionTempVariableRef,
     makeExpressionVariableRef,
 )
-from nuitka.nodes.VariableReleaseNodes import makeStatementReleaseVariable
 from nuitka.PythonVersions import (
     getErrorMessageExecWithNestedFunction,
     python_version,
@@ -51,7 +36,7 @@ from nuitka.Variables import isSharedAmongScopes, releaseSharedScopeInformation
 
 from .Operations import VisitorNoopMixin, visitTree
 from .ReformulationFunctionStatements import addFunctionVariableReleases
-from .ReformulationTryFinallyStatements import makeTryFinallyStatement
+from .ReformulationTryFinallyStatements import makeTryFinallyReleaseStatement
 from .SyntaxErrors import raiseSyntaxError
 
 # Note: We do the variable scope assignment, as an extra step from tree
@@ -162,7 +147,7 @@ class VariableClosureLookupVisitorPhase1(VisitorNoopMixin):
                     temp_scope = provider.allocateTempScope("class_inplace")
 
                     tmp_variable = provider.allocateTempVariable(
-                        temp_scope=temp_scope, name="value"
+                        temp_scope=temp_scope, name="value", temp_type="object"
                     )
 
                     statements = mergeStatements(
@@ -172,7 +157,7 @@ class VariableClosureLookupVisitorPhase1(VisitorNoopMixin):
                                 source=node.subnode_source.subnode_left,
                                 source_ref=node.source_ref,
                             ),
-                            makeTryFinallyStatement(
+                            makeTryFinallyReleaseStatement(
                                 provider=provider,
                                 tried=(
                                     makeStatementAssignmentVariable(
@@ -198,9 +183,7 @@ class VariableClosureLookupVisitorPhase1(VisitorNoopMixin):
                                         source_ref=node.source_ref,
                                     ),
                                 ),
-                                final=makeStatementReleaseVariable(
-                                    variable=tmp_variable, source_ref=node.source_ref
-                                ),
+                                variables=(tmp_variable,),
                                 source_ref=node.source_ref,
                             ),
                         )
@@ -308,32 +291,19 @@ class VariableClosureLookupVisitorPhase1(VisitorNoopMixin):
         elif node.isExpressionGeneratorObjectBody():
             if python_version >= 0x300:
                 self._handleNonLocal(node)
-
-            # Only Python3.4 or later allows for generators to have qualname.
-            if python_version >= 0x340:
                 self._handleQualnameSetup(node)
         elif node.isExpressionCoroutineObjectBody():
             self._handleNonLocal(node)
-
             self._handleQualnameSetup(node)
         elif node.isExpressionAsyncgenObjectBody():
             self._handleNonLocal(node)
-
             self._handleQualnameSetup(node)
-        elif node.isExpressionClassBodyP3():
+        elif node.isExpressionClassMappingBody():
             self._handleNonLocal(node)
-
-            # Python3.4 allows for class declarations to be made global, even
-            # after they were declared, so we need to fix this up.
-            if python_version >= 0x340:
-                self._handleQualnameSetup(node)
+            self._handleQualnameSetup(node)
         elif node.isExpressionFunctionBody():
             if python_version >= 0x300:
                 self._handleNonLocal(node)
-
-            # Python 3.4 allows for class declarations to be made global, even
-            # after they were declared, so we need to fix this up.
-            if python_version >= 0x340:
                 self._handleQualnameSetup(node)
         # Check if continue and break are properly in loops. If not, raise a
         # syntax error.
@@ -471,6 +441,16 @@ can not delete variable '%s' referenced in nested scope"""
                     while node != class_var.getOwner():
                         node = node.getParentVariableProvider()
                         node.getLocalsScope().registerClosureVariable(class_var)
+        elif node.isStatementAssignmentVariableGeneric():
+            node.parent.replaceChild(
+                node,
+                makeStatementAssignmentVariable(
+                    source=node.subnode_source,
+                    variable=node.variable,
+                    variable_version=node.variable_version,
+                    source_ref=node.source_ref,
+                ),
+            )
 
 
 def completeVariableClosures(tree):
@@ -485,3 +465,19 @@ def completeVariableClosures(tree):
 
     # Only used to detect syntax errors.
     releaseSharedScopeInformation(tree)
+
+
+#     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/tree/__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. """