Nuitka-winsvc 2.1.6__cp311-cp311-win_amd64.whl → 2.2.1__cp311-cp311-win_amd64.whl

nuitka/nodes/CodeObjectSpecs.py

@@ -190,7 +190,7 @@ class CodeObjectSpec(object):
         return self.co_name
 
     def getCodeObjectQualname(self):
-        return self.co_name
+        return self.co_qualname
 
     def hasStarListArg(self):
         return self.co_has_starlist

nuitka/nodes/ConstantRefNodes.py

@@ -694,6 +694,25 @@ class ExpressionConstantListRef(
             """Iteration over constant list lowered to tuple.""",
         )
 
+    def computeExpressionComparisonIn(self, in_node, value_node, trace_collection):
+        result = makeConstantRefNode(
+            constant=tuple(self.constant),
+            user_provided=self.user_provided,
+            source_ref=self.source_ref,
+        )
+
+        self.parent.replaceChild(self, result)
+        self.finalize()
+
+        # We did not know this before
+        trace_collection.onExceptionRaiseExit(BaseException)
+
+        return (
+            in_node,
+            "new_constant",
+            """Contains test over constant list lowered to tuple.""",
+        )
+
 
 class ExpressionConstantListEmptyRef(EmptyContainerMixin, ExpressionConstantListRef):
     kind = "EXPRESSION_CONSTANT_LIST_EMPTY_REF"
@@ -757,6 +776,25 @@ class ExpressionConstantSetRef(ExpressionSetShapeExactMixin, ExpressionConstantR
             """Iteration over constant set lowered to tuple.""",
         )
 
+    def computeExpressionComparisonIn(self, in_node, value_node, trace_collection):
+        result = makeConstantRefNode(
+            constant=frozenset(self.constant),
+            user_provided=self.user_provided,
+            source_ref=self.source_ref,
+        )
+
+        self.parent.replaceChild(self, result)
+        self.finalize()
+
+        # We did not know this before
+        trace_collection.onExceptionRaiseExit(BaseException)
+
+        return (
+            in_node,
+            "new_constant",
+            """Contains test over constant set lowered to frozenset.""",
+        )
+
 
 class ExpressionConstantSetEmptyRef(EmptyContainerMixin, ExpressionConstantSetRef):
     kind = "EXPRESSION_CONSTANT_SET_EMPTY_REF"

nuitka/nodes/CtypesNodes.py

@@ -5,7 +5,6 @@
 
 """
 
-
 from .HardImportNodesGenerated import (
     ExpressionCtypesCdllBefore38CallBase,
     ExpressionCtypesCdllSince38CallBase,

nuitka/nodes/DictionaryNodes.py

@@ -8,7 +8,6 @@ that is the child of the dictionary creation.
 
 """
 
-
 from nuitka import Constants
 from nuitka.specs.BuiltinDictOperationSpecs import dict_fromkeys_spec
 from nuitka.specs.BuiltinParameterSpecs import extractBuiltinArgs

nuitka/nodes/ExceptionNodes.py

@@ -220,6 +220,16 @@ class ExpressionBuiltinMakeExceptionImportError(
         return False
 
 
+class ExpressionBuiltinMakeExceptionModuleNotFoundError(
+    ExpressionBuiltinMakeExceptionImportError
+):
+    kind = "EXPRESSION_BUILTIN_MAKE_EXCEPTION_MODULE_NOT_FOUND_ERROR"
+
+    @staticmethod
+    def getExceptionName():
+        return "ModuleNotFoundError"
+
+
 class ExpressionCaughtMixin(ExpressionNoSideEffectsMixin):
     """Common things for all caught exception references."""
 

nuitka/nodes/ExpressionBases.py

@@ -446,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,
@@ -496,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,
@@ -550,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,

nuitka/nodes/ExpressionBasesGenerated.py

@@ -2,18 +2,33 @@
 
 
 # We are not avoiding these in generated code at all
-# pylint: disable=I0021,too-many-lines
-# pylint: disable=I0021,line-too-long
-# pylint: disable=I0021,too-many-instance-attributes
-# pylint: disable=I0021,too-many-return-statements
+# pylint: disable=I0021,line-too-long,too-many-instance-attributes,too-many-lines
+# pylint: disable=I0021,too-many-arguments,too-many-return-statements,too-many-statements
 
 
 """Children having expression bases
 
 WARNING, this code is GENERATED. Modify the template ChildrenHavingMixin.py.j2 instead!
 
-spell-checker: ignore append capitalize casefold center clear copy count decode encode endswith expandtabs extend find format formatmap fromkeys get haskey index insert isalnum isalpha isascii isdecimal isdigit isidentifier islower isnumeric isprintable isspace istitle isupper items iteritems iterkeys itervalues join keys ljust lower lstrip maketrans partition pop popitem prepare remove replace reverse rfind rindex rjust rpartition rsplit rstrip setdefault sort split splitlines startswith strip swapcase title translate update upper values viewitems viewkeys viewvalues zfill
-spell-checker: ignore args chars count default delete encoding end errors fillchar index item iterable keepends key kwargs maxsplit new old pairs prefix sep start stop sub suffix table tabsize value width
+spell-checker: ignore __prepare__ append args autograph buffering capitalize casefold
+spell-checker: ignore center chars clear closefd copy count decode default delete dist
+spell-checker: ignore distribution_name encode encoding end endswith errors exit_code
+spell-checker: ignore expandtabs experimental_attributes experimental_autograph_options
+spell-checker: ignore experimental_compile experimental_follow_type_hints
+spell-checker: ignore experimental_implements experimental_relax_shapes extend file
+spell-checker: ignore fillchar find format format_map formatmap fromkeys func get group
+spell-checker: ignore handle has_key haskey index input_signature insert isalnum isalpha
+spell-checker: ignore isascii isdecimal isdigit isidentifier islower isnumeric isprintable
+spell-checker: ignore isspace istitle isupper item items iterable iteritems iterkeys
+spell-checker: ignore itervalues jit_compile join keepends key keys kwargs ljust lower
+spell-checker: ignore lstrip maketrans maxsplit mode name new newline old opener p package
+spell-checker: ignore package_or_requirement pairs partition path pop popitem prefix
+spell-checker: ignore prepare reduce_retracing remove replace resource resource_name
+spell-checker: ignore reverse rfind rindex rjust rpartition rsplit rstrip s sep setdefault
+spell-checker: ignore sort split splitlines start startswith stop strip sub suffix
+spell-checker: ignore swapcase table tabsize title translate update upper use_errno
+spell-checker: ignore use_last_error value values viewitems viewkeys viewvalues width
+spell-checker: ignore winmode zfill
 """
 
 
@@ -283,12 +298,12 @@ class ChildrenHavingArgsTupleNameOptionalPathOptionalFinalNoRaiseMixin(Expressio
 
         values = {
             "args": tuple(v.makeClone() for v in self.subnode_args),
-            "name": self.subnode_name.makeClone()
-            if self.subnode_name is not None
-            else None,
-            "path": self.subnode_path.makeClone()
-            if self.subnode_path is not None
-            else None,
+            "name": (
+                self.subnode_name.makeClone() if self.subnode_name is not None else None
+            ),
+            "path": (
+                self.subnode_path.makeClone() if self.subnode_path is not None else None
+            ),
         }
 
         values.update(self.getDetails())
@@ -1631,9 +1646,11 @@ class ChildHavingPromptOptionalFinalMixin(ExpressionBase):
         """
 
         values = {
-            "prompt": self.subnode_prompt.makeClone()
-            if self.subnode_prompt is not None
-            else None,
+            "prompt": (
+                self.subnode_prompt.makeClone()
+                if self.subnode_prompt is not None
+                else None
+            ),
         }
 
         values.update(self.getDetails())

nuitka/nodes/FunctionNodes.py

@@ -16,6 +16,7 @@ classes.
 """
 
 import inspect
+import re
 
 from nuitka import Options, Variables
 from nuitka.Constants import isMutable
@@ -29,8 +30,9 @@ from nuitka.specs.ParameterSpecs import (
     TooManyArguments,
     matchCall,
 )
-from nuitka.Tracing import optimization_logger
+from nuitka.Tracing import optimization_logger, printError
 from nuitka.tree.Extractions import updateVariableUsage
+from nuitka.tree.SourceHandling import readSourceLines
 from nuitka.tree.TreeHelpers import makeDictCreationOrConstant2
 
 from .ChildrenHavingMixins import (
@@ -806,9 +808,11 @@ class ExpressionFunctionPureBody(ExpressionFunctionBody):
                     "{source_ref} : {tags} : {message}".format(
                         source_ref=source_ref.getAsString(),
                         tags=tag,
-                        message=change_desc()
-                        if inspect.isfunction(change_desc)
-                        else change_desc,
+                        message=(
+                            change_desc()
+                            if inspect.isfunction(change_desc)
+                            else change_desc
+                        ),
                     )
                 )
 
@@ -1100,7 +1104,7 @@ if python_version < 0x340:
 class ExpressionFunctionRef(ExpressionNoSideEffectsMixin, ExpressionBase):
     kind = "EXPRESSION_FUNCTION_REF"
 
-    __slots__ = "function_body", "code_name"
+    __slots__ = "function_body", "code_name", "function_source"
 
     def __init__(self, source_ref, function_body=None, code_name=None):
         assert function_body is not None or code_name is not None
@@ -1110,10 +1114,12 @@ class ExpressionFunctionRef(ExpressionNoSideEffectsMixin, ExpressionBase):
 
         self.function_body = function_body
         self.code_name = code_name
+        self.function_source = None
 
     def finalize(self):
         del self.parent
         del self.function_body
+        del self.function_source
 
     def getName(self):
         return self.function_body.getName()
@@ -1142,6 +1148,45 @@ class ExpressionFunctionRef(ExpressionNoSideEffectsMixin, ExpressionBase):
         # TODO: Function after collection may now know something.
         return self, None, None
 
+    def getFunctionSourceCode(self):
+        if self.function_source is None:
+            try:
+                lines = readSourceLines(self.getFunctionBody().source_ref)
+
+                # This needs to match "inspect.findsource".
+                pat = re.compile(
+                    r"^(\s*def\s)|(\s*async\s+def\s)|(.*(?<!\w)lambda(:|\s))|^(\s*@)"
+                )
+
+                line_number = self.source_ref.line - 1
+
+                while line_number > 0:
+                    line = lines[line_number]
+
+                    if pat.match(line):
+                        break
+
+                    line_number = line_number - 1
+
+                self.function_source = (
+                    "".join(inspect.getblock(lines[line_number:])),
+                    line_number,
+                )
+            except Exception:
+                printError(
+                    "Problem with retrieving source code of '%s' at %s"
+                    % (self.getFunctionSuperQualifiedName(), self.source_ref)
+                )
+                raise
+
+        return self.function_source
+
+    def getFunctionSuperQualifiedName(self):
+        return "%s.%s" % (
+            self.getParentModule().getFullName(),
+            self.getFunctionBody().getFunctionQualname(),
+        )
+
 
 def makeExpressionFunctionCall(function, values, source_ref):
     assert function.isExpressionFunctionCreation()