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

nuitka/nodes/ExceptionNodes.py

@@ -1,33 +1,20 @@
-#     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
+
+
 """ Nodes related to raising and making exceptions.
 
 """
 
-from .ChildrenHavingMixins import (
-    ChildrenHavingExceptionTypeExceptionValueMixin,
-)
+from nuitka.PythonVersions import python_version
+
+from .ChildrenHavingMixins import ChildHavingExceptionTypeMixin
 from .ExpressionBases import ExpressionBase, ExpressionNoSideEffectsMixin
 from .ExpressionBasesGenerated import (
+    ExpressionBuiltinMakeExceptionAttributeErrorBase,
     ExpressionBuiltinMakeExceptionBase,
     ExpressionBuiltinMakeExceptionImportErrorBase,
 )
-from .NodeBases import StatementBase
+from .NodeBases import SideEffectsFromChildrenMixin, StatementBase
 from .StatementBasesGenerated import StatementRaiseExceptionBase
 
 
@@ -81,14 +68,6 @@ class StatementRaiseException(
         return "exception raise statement"
 
 
-class StatementRaiseExceptionImplicit(StatementRaiseException):
-    kind = "STATEMENT_RAISE_EXCEPTION_IMPLICIT"
-
-    @staticmethod
-    def getStatementNiceName():
-        return "implicit exception raise statement"
-
-
 class StatementReraiseException(StatementRaiseExceptionMixin, StatementBase):
     kind = "STATEMENT_RERAISE_EXCEPTION"
 
@@ -111,9 +90,7 @@ class StatementReraiseException(StatementRaiseExceptionMixin, StatementBase):
         return "exception re-raise statement"
 
 
-class ExpressionRaiseException(
-    ChildrenHavingExceptionTypeExceptionValueMixin, ExpressionBase
-):
+class ExpressionRaiseException(ChildHavingExceptionTypeMixin, ExpressionBase):
     """This node type is only produced via optimization.
 
     CPython only knows exception raising as a statement, but often the raising
@@ -123,13 +100,12 @@ class ExpressionRaiseException(
 
     kind = "EXPRESSION_RAISE_EXCEPTION"
 
-    named_children = ("exception_type", "exception_value")
+    named_children = ("exception_type",)
 
-    def __init__(self, exception_type, exception_value, source_ref):
-        ChildrenHavingExceptionTypeExceptionValueMixin.__init__(
+    def __init__(self, exception_type, source_ref):
+        ChildHavingExceptionTypeMixin.__init__(
             self,
             exception_type=exception_type,
-            exception_value=exception_value,
         )
 
         ExpressionBase.__init__(self, source_ref)
@@ -156,9 +132,9 @@ Propagated implicit raise expression to raise statement.""",
         )
 
     def asStatement(self):
-        return StatementRaiseExceptionImplicit(
+        return StatementRaiseException(
             exception_type=self.subnode_exception_type,
-            exception_value=self.subnode_exception_value,
+            exception_value=None,
             exception_trace=None,
             exception_cause=None,
             source_ref=self.source_ref,
@@ -170,18 +146,19 @@ class ExpressionBuiltinMakeException(ExpressionBuiltinMakeExceptionBase):
 
     named_children = ("args|tuple",)
 
-    __slots__ = ("exception_name",)
+    __slots__ = ("exception_name", "for_raise")
 
     # There is nothing to compute for it as a value.
     auto_compute_handling = "final,no_raise"
 
-    def __init__(self, exception_name, args, source_ref):
+    def __init__(self, exception_name, args, for_raise, source_ref):
         ExpressionBuiltinMakeExceptionBase.__init__(self, args, source_ref=source_ref)
 
         self.exception_name = exception_name
+        self.for_raise = for_raise
 
     def getDetails(self):
-        return {"exception_name": self.exception_name}
+        return {"exception_name": self.exception_name, "for_raise": self.for_raise}
 
     def getExceptionName(self):
         return self.exception_name
@@ -202,7 +179,7 @@ class ExpressionBuiltinMakeException(ExpressionBuiltinMakeExceptionBase):
 
 
 class ExpressionBuiltinMakeExceptionImportError(
-    ExpressionBuiltinMakeExceptionImportErrorBase
+    SideEffectsFromChildrenMixin, ExpressionBuiltinMakeExceptionImportErrorBase
 ):
     """Python3 ImportError dedicated node with extra arguments."""
 
@@ -210,11 +187,15 @@ class ExpressionBuiltinMakeExceptionImportError(
 
     named_children = ("args|tuple", "name|optional", "path|optional")
 
-    __slots__ = ("exception_name",)
+    node_attributes = ("for_raise",)
+
+    __slots__ = ()
 
     # There is nothing to compute for it as a value.
     auto_compute_handling = "final,no_raise"
 
+    python_version_spec = ">= 0x300"
+
     @staticmethod
     def getExceptionName():
         return "ImportError"
@@ -234,6 +215,55 @@ class ExpressionBuiltinMakeExceptionImportError(
         return False
 
 
+class ExpressionBuiltinMakeExceptionModuleNotFoundError(
+    ExpressionBuiltinMakeExceptionImportError
+):
+    kind = "EXPRESSION_BUILTIN_MAKE_EXCEPTION_MODULE_NOT_FOUND_ERROR"
+
+    python_version_spec = ">= 0x360"
+
+    @staticmethod
+    def getExceptionName():
+        return "ModuleNotFoundError"
+
+
+class ExpressionBuiltinMakeExceptionAttributeError(
+    SideEffectsFromChildrenMixin, ExpressionBuiltinMakeExceptionAttributeErrorBase
+):
+    """Python3 ImportError dedicated node with extra arguments."""
+
+    kind = "EXPRESSION_BUILTIN_MAKE_EXCEPTION_ATTRIBUTE_ERROR"
+
+    named_children = ("args|tuple", "name|optional", "obj|optional")
+
+    node_attributes = ("for_raise",)
+
+    __slots__ = ()
+
+    # There is nothing to compute for it as a value.
+    auto_compute_handling = "final,no_raise"
+
+    python_version_spec = ">= 0x3a0"
+
+    @staticmethod
+    def getExceptionName():
+        return "AttributeError"
+
+    def computeExpression(self, trace_collection):
+        return self, None, None
+
+    def mayRaiseException(self, exception_type):
+        for arg in self.subnode_args:
+            if arg.mayRaiseException(exception_type):
+                return True
+
+        return False
+
+    @staticmethod
+    def mayRaiseExceptionOperation():
+        return False
+
+
 class ExpressionCaughtMixin(ExpressionNoSideEffectsMixin):
     """Common things for all caught exception references."""
 
@@ -273,3 +303,61 @@ class ExpressionCaughtExceptionTracebackRef(ExpressionCaughtMixin, ExpressionBas
 
     def computeExpressionRaw(self, trace_collection):
         return self, None, None
+
+
+def makeBuiltinMakeExceptionNode(
+    exception_name, args, for_raise, name=None, path=None, obj=None, source_ref=None
+):
+    assert type(exception_name) is str, exception_name
+
+    if exception_name == "ImportError" and python_version >= 0x300:
+        return ExpressionBuiltinMakeExceptionImportError(
+            args=args,
+            name=name,
+            path=path,
+            for_raise=for_raise,
+            source_ref=source_ref,
+        )
+    elif exception_name == "ModuleNotFoundError" and python_version >= 0x360:
+        return ExpressionBuiltinMakeExceptionModuleNotFoundError(
+            args=args,
+            name=name,
+            path=path,
+            for_raise=for_raise,
+            source_ref=source_ref,
+        )
+    elif exception_name == "AttributeError" and python_version >= 0x3A0:
+        return ExpressionBuiltinMakeExceptionAttributeError(
+            args=args,
+            name=name,
+            obj=obj,
+            for_raise=for_raise,
+            source_ref=source_ref,
+        )
+    else:
+        # We expect to only get the star arguments for these.
+        assert name is None
+        assert path is None
+
+        return ExpressionBuiltinMakeException(
+            exception_name=exception_name,
+            args=args,
+            for_raise=for_raise,
+            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/nodes/ExecEvalNodes.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
+
+
 """ Nodes concern with exec and eval builtins.
 
 These are the dynamic codes, and as such rather difficult. We would like
@@ -225,3 +211,19 @@ class ExpressionBuiltinCompile(ChildrenExpressionBuiltinCompileMixin, Expression
 
         # TODO: Attempt for constant values to do it.
         return self, None, 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/nodes/ExpressionBases.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
+
+
 """ Expression base classes.
 
 These classes provide the generic base classes available for
@@ -460,9 +446,11 @@ class ExpressionBase(NodeBase):
             trace_collection.onExceptionRaiseExit(BaseException)
 
             return makeRaiseTypeErrorExceptionReplacementFromTemplateAndValue(
-                template="int() argument must be a string or a number, not '%s'"
-                if python_version < 0x300
-                else "int() argument must be a string, a bytes-like object or a number, not '%s'",
+                template=(
+                    "int() argument must be a string or a number, not '%s'"
+                    if python_version < 0x300
+                    else "int() argument must be a string, a bytes-like object or a number, not '%s'"
+                ),
                 operation="int",
                 original_node=int_node,
                 value_node=self,
@@ -510,9 +498,11 @@ class ExpressionBase(NodeBase):
             trace_collection.onExceptionRaiseExit(BaseException)
 
             return makeRaiseTypeErrorExceptionReplacementFromTemplateAndValue(
-                "float() argument must be a string or a number"
-                if Options.is_full_compat and python_version < 0x300
-                else "float() argument must be a string or a number, not '%s'",
+                (
+                    "float() argument must be a string or a number"
+                    if Options.is_full_compat and python_version < 0x300
+                    else "float() argument must be a string or a number, not '%s'"
+                ),
                 operation="long",
                 original_node=float_node,
                 value_node=self,
@@ -564,9 +554,11 @@ class ExpressionBase(NodeBase):
             trace_collection.onExceptionRaiseExit(BaseException)
 
             return makeRaiseTypeErrorExceptionReplacementFromTemplateAndValue(
-                "complex() argument must be a string or a number"
-                if Options.is_full_compat and python_version < 0x300
-                else "complex() argument must be a string or a number, not '%s'",
+                (
+                    "complex() argument must be a string or a number"
+                    if Options.is_full_compat and python_version < 0x300
+                    else "complex() argument must be a string or a number, not '%s'"
+                ),
                 operation="complex",
                 original_node=complex_node,
                 value_node=self,
@@ -1291,3 +1283,19 @@ class ExpressionBuiltinSingleArgBase(
             return self.computeBuiltinSpec(
                 trace_collection=trace_collection, given_values=(value,)
             )
+
+
+#     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.