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

nuitka/specs/ParameterSpecs.py

@@ -136,12 +136,12 @@ class ParameterSpec(object):
             "ps_normal_args": ",".join(self.normal_args),
             "ps_pos_only_args": self.pos_only_args,
             "ps_kw_only_args": ",".join(self.kw_only_args),
-            "ps_list_star_arg": self.list_star_arg
-            if self.list_star_arg is not None
-            else "",
-            "ps_dict_star_arg": self.dict_star_arg
-            if self.dict_star_arg is not None
-            else "",
+            "ps_list_star_arg": (
+                self.list_star_arg if self.list_star_arg is not None else ""
+            ),
+            "ps_dict_star_arg": (
+                self.dict_star_arg if self.dict_star_arg is not None else ""
+            ),
             "ps_default_count": self.default_count,
             "type_shape": self.type_shape,
         }
@@ -556,9 +556,11 @@ def matchCall(
                 "%s expected %s%s, got %d"
                 % (
                     func_name,
-                    ("at least " if python_version < 0x300 else "")
-                    if num_defaults > 0
-                    else "exactly ",
+                    (
+                        ("at least " if python_version < 0x300 else "")
+                        if num_defaults > 0
+                        else "exactly "
+                    ),
                     "%d arguments" % num_required,
                     num_total,
                 )

nuitka/tools/environments/Virtualenv.py

@@ -5,7 +5,6 @@
 
 """
 
-
 import os
 import sys
 from contextlib import contextmanager

nuitka/tools/specialize/CTypeDescriptions.py

@@ -275,9 +275,11 @@ class TypeDescBase(getMetaClassBase("Type", require_slots=False)):
         if self is object_desc or other is object_desc:
             return "%s == %s" % (
                 self.getTypeValueExpression(None) if self is not object_desc else type1,
-                other.getTypeValueExpression(None)
-                if other is not object_desc
-                else type2,
+                (
+                    other.getTypeValueExpression(None)
+                    if other is not object_desc
+                    else type2
+                ),
             )
         elif self is other:
             return "1"
@@ -288,9 +290,11 @@ class TypeDescBase(getMetaClassBase("Type", require_slots=False)):
         if self is object_desc or other is object_desc:
             return "%s != %s" % (
                 self.getTypeValueExpression(None) if self is not object_desc else type1,
-                other.getTypeValueExpression(None)
-                if other is not object_desc
-                else type2,
+                (
+                    other.getTypeValueExpression(None)
+                    if other is not object_desc
+                    else type2
+                ),
             )
         elif self is other:
             return "0"
@@ -1372,23 +1376,23 @@ class LongDesc(ConcreteNonSequenceTypeBase):
 
     @staticmethod
     def getLongValueSizeExpression(operand):
-        return "Py_SIZE(%s_long_object)" % operand
+        return "Nuitka_LongGetSignedDigitSize(%s_long_object)" % operand
 
     @staticmethod
     def getLongValueIsNegativeTestExpression(operand):
-        return "Py_SIZE(%s_long_object) < 0" % operand
+        return "Nuitka_LongIsNegative(%s_long_object)" % operand
 
     @staticmethod
     def getLongValueDigitCountExpression(operand):
-        return "Py_ABS(Py_SIZE(%s_long_object))" % operand
+        return "Nuitka_LongGetDigitSize(%s_long_object)" % operand
 
     @staticmethod
     def getLongValueDigitExpression(operand, index):
-        return "%s_long_object->ob_digit[%s]" % (operand, index)
+        return "Nuitka_LongGetDigitPointer(%s_long_object)[%s]" % (operand, index)
 
     @staticmethod
     def getLongValueDigitsPointerExpression(operand):
-        return "%s_long_object->ob_digit" % operand
+        return "Nuitka_LongGetDigitPointer(%s_long_object)" % operand
 
     @staticmethod
     def getLongValueMediumValueExpression(operand):

nuitka/tools/specialize/SpecializeC.py

@@ -360,9 +360,9 @@ def makeHelperOperations(
             op_code=op_code,
             operator=operator,
             nb_slot=_getNbSlotFromOperand(operator, op_code),
-            nb_inplace_slot=_getNbInplaceSlotFromOperand(operator, op_code)
-            if inplace
-            else None,
+            nb_inplace_slot=(
+                _getNbInplaceSlotFromOperand(operator, op_code) if inplace else None
+            ),
             sq_slot=sq_slot,
             sq_inplace_slot=sq_inplace_slot,
             object_desc=object_desc,
@@ -1232,15 +1232,17 @@ def makeHelperBuiltinTypeMethods():
                             builtin_type=type_desc,
                             builtin_arg_name=type_desc.type_name,
                             method_name=method_name,
-                            api_suffix=str(arg_count + 1)
-                            if len(arg_counts) > 1
-                            else "",
+                            api_suffix=(
+                                str(arg_count + 1) if len(arg_counts) > 1 else ""
+                            ),
                             arg_names=variant_args,
                             arg_types=[object_desc] * len(variant_args),
                             formatArgumentDeclaration=formatArgumentDeclaration,
-                            extra_check=_getCheckForShape(result_shape)
-                            if result_shape is not None
-                            else None,
+                            extra_check=(
+                                _getCheckForShape(result_shape)
+                                if result_shape is not None
+                                else None
+                            ),
                             zip=zip,
                             len=len,
                             name=template.name,

nuitka/tools/specialize/SpecializePython.py

@@ -12,15 +12,18 @@ nuitka.Options.is_full_compat = False
 
 # isort:start
 
+import textwrap
 from collections import namedtuple
 
 import nuitka.code_generation.BinaryOperationHelperDefinitions
 import nuitka.code_generation.CodeGeneration
 import nuitka.code_generation.ComparisonCodes
 import nuitka.code_generation.Namify
+import nuitka.nodes.NetworkxNodes
 import nuitka.nodes.PackageMetadataNodes
 import nuitka.nodes.PackageResourceNodes
 import nuitka.nodes.SideEffectNodes
+import nuitka.nodes.TensorflowNodes
 import nuitka.specs.BuiltinBytesOperationSpecs
 import nuitka.specs.BuiltinDictOperationSpecs
 import nuitka.specs.BuiltinListOperationSpecs
@@ -248,20 +251,35 @@ lambda source_ref: wrapExpressionWithNodeSideEffects(
 
 
 def emitGenerationWarning(emit, doc_string, template_name):
-    attribute_code_names = set(attribute_information.keys())
-    attribute_code_names = set(
+    generate_names = set()
+
+    generate_names.update(attribute_information.keys())
+    generate_names.update(
         attribute_name.replace("_", "") for attribute_name in attribute_information
     )
 
-    attribute_arg_names = set(sum(attribute_shape_args.values(), ()))
+    generate_names.update(sum(attribute_shape_args.values(), ()))
+
+    for spec_descriptions in getSpecVersions(nuitka.specs.HardImportSpecs):
+        spec = spec_descriptions[0][2]
+        generate_names.update(spec.getArgumentNames())
+
+    ignores = textwrap.fill(
+        " ".join(sorted(generate_names)),
+        width=90,
+        initial_indent="spell-checker: ignore ",
+        subsequent_indent="spell-checker: ignore ",
+        break_on_hyphens=False,
+        break_long_words=False,
+        expand_tabs=False,
+        replace_whitespace=False,
+    )
 
     emit(
         """
 # 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
 """
     )
 
@@ -271,17 +289,11 @@ def emitGenerationWarning(emit, doc_string, template_name):
 
 WARNING, this code is GENERATED. Modify the template %s instead!
 
-spell-checker: ignore %s
-spell-checker: ignore %s
+%s
 """
 
 '''
-        % (
-            doc_string,
-            template_name,
-            " ".join(sorted(attribute_code_names)),
-            " ".join(sorted(attribute_arg_names)),
-        )
+        % (doc_string, template_name, ignores)
     )
 
 
@@ -450,6 +462,8 @@ def makeCodeCased(value):
 
 
 def getCallModuleName(module_name, function_name):
+    # return driven, pylint: disable=too-many-return-statements
+
     if module_name in ("pkg_resources", "importlib.metadata", "importlib_metadata"):
         if function_name in ("resource_stream", "resource_string"):
             return "PackageResourceNodes"
@@ -465,6 +479,12 @@ def getCallModuleName(module_name, function_name):
         if function_name == "open":
             return "BuiltinOpenNodes"
 
+    if module_name == "tensorflow":
+        return "TensorflowNodes"
+
+    if module_name.startswith("networkx"):
+        return "NetworkxNodes"
+
     assert False, (module_name, function_name)
 
 
@@ -616,14 +636,14 @@ def _parseNamedChildrenSpec(named_children):
                     named_children_checkers[named_child] = "convertNoneConstantToNone"
                 elif named_child_property == "auto_none_empty_str":
                     named_children_types[named_child] = "optional"
-                    named_children_checkers[
-                        named_child
-                    ] = "convertEmptyStrConstantToNone"
+                    named_children_checkers[named_child] = (
+                        "convertEmptyStrConstantToNone"
+                    )
                 elif named_child_property == "statements_or_none":
                     named_children_types[named_child] = "optional"
-                    named_children_checkers[
-                        named_child
-                    ] = "checkStatementsSequenceOrNone"
+                    named_children_checkers[named_child] = (
+                        "checkStatementsSequenceOrNone"
+                    )
                 elif named_child_property == "statements":
                     named_children_checkers[named_child] = "checkStatementsSequence"
                 elif named_child_property == "optional":
@@ -712,15 +732,15 @@ def addFromNodes():
         _addFromNode(node_class)
 
     # Fake factories:
-    node_factory_translations[
-        "ExpressionImportlibMetadataMetadataCall"
-    ] = "makeExpressionImportlibMetadataMetadataCall"
-    node_factory_translations[
-        "ExpressionImportlibMetadataBackportMetadataCall"
-    ] = "makeExpressionImportlibMetadataBackportMetadataCall"
-    node_factory_translations[
-        "ExpressionBuiltinsOpenCall"
-    ] = "makeExpressionBuiltinsOpenCall"
+    node_factory_translations["ExpressionImportlibMetadataMetadataCall"] = (
+        "makeExpressionImportlibMetadataMetadataCall"
+    )
+    node_factory_translations["ExpressionImportlibMetadataBackportMetadataCall"] = (
+        "makeExpressionImportlibMetadataBackportMetadataCall"
+    )
+    node_factory_translations["ExpressionBuiltinsOpenCall"] = (
+        "makeExpressionBuiltinsOpenCall"
+    )
     node_factory_translations["ExpressionSysExitCall"] = "makeExpressionSysExitCall"
 
 
@@ -1024,9 +1044,16 @@ hard_import_node_classes = {}
                         assert optional_name not in named_children_types
                         named_children_types[optional_name] = "optional"
 
+                if spec.getStarListArgumentName():
+                    named_children_types[spec.getStarListArgumentName()] = "tuple"
+
                 if spec.getStarDictArgumentName():
                     named_children_types[spec.getStarDictArgumentName()] = "tuple"
 
+                for kw_only_name in spec.getKwOnlyParameterNames():
+                    assert kw_only_name not in named_children_types
+                    named_children_types[kw_only_name] = "optional"
+
                 if parameter_names:
                     mixin_name = addChildrenMixin(
                         True,

nuitka/tools/testing/Common.py

@@ -309,6 +309,10 @@ def decideFilenameVersionSkip(filename):
     if filename.endswith("_37.py") and _python_version >= (3, 8):
         return False
 
+    # Skip tests that require Python 3.11 at maximum.
+    if filename.endswith("_311.py") and _python_version >= (3, 8):
+        return False
+
     # Skip tests that require Python 3.2 at least.
     if filename.endswith("32.py") and _python_version < (3, 2):
         return False
@@ -349,6 +353,10 @@ def decideFilenameVersionSkip(filename):
     if filename.endswith("311.py") and _python_version < (3, 11):
         return False
 
+    # Skip tests that require Python 3.12 at least.
+    if filename.endswith("312.py") and _python_version < (3, 12):
+        return False
+
     return True
 
 
@@ -702,7 +710,7 @@ def checkReferenceCount(checked_function, max_rounds=20, explain=False):
                     my_print("extra:", m1[key], key)
                 elif m1[key] != m2[key]:
                     my_print("*" * 80)
-                    my_print(m1[key], "->", m2[key], key)
+                    my_print(m1[key], "->", m2[key], repr(key))
                 else:
                     pass
 
@@ -805,9 +813,9 @@ Defaults to off.""",
             assert False
     elif mode == "coverage":
         return SearchModeCoverage(
-            start_at=options.pattern.replace("/", os.path.sep)
-            if options.pattern
-            else None
+            start_at=(
+                options.pattern.replace("/", os.path.sep) if options.pattern else None
+            )
         )
     else:
         test_logger.sysexit("Error, using unknown search mode %r" % mode)
@@ -825,7 +833,7 @@ def executeReferenceChecked(
 ):
     gc.disable()
 
-    extract_number = lambda name: int(name.replace(prefix, ""))
+    extract_number = lambda name: int(name.replace(prefix, "") or "0")
 
     # Find the function names.
     matching_names = tuple(
@@ -941,7 +949,8 @@ def withExtendedExtraOptions(*args):
 
 def indentedCode(codes, count):
     """Indent code, used for generating test codes."""
-    return "\n".join(" " * count + line if line else "" for line in codes)
+    indent = " " * count
+    return "\n".join(indent + line if line else "" for line in codes)
 
 
 def convertToPython(doctests, line_filter=None):
@@ -1601,7 +1610,14 @@ def checkLoadedFileAccesses(loaded_filenames, current_dir):
         # Loading from home directories is OK too.
         if any(
             isFilenameSameAsOrBelowPath(path, loaded_filename)
-            for path in ("/home", "/data", "/root", "/Users", "/Library/Preferences")
+            for path in (
+                "/home",
+                "/data",
+                "/root",
+                "/Users",
+                "/Library/Preferences",
+                "/agent",  # Azure
+            )
         ):
             continue
 
@@ -1768,6 +1784,7 @@ def checkLoadedFileAccesses(loaded_filenames, current_dir):
                 "/AppleInternal",
                 "/System/Volumes/Preboot",
                 "/usr/lib/system/",
+                "/usr/libexec/swift",
             ):
                 if isFilenameSameAsOrBelowPath(ignored_dir, loaded_filename):
                     ignore = False

nuitka/tools/testing/OutputComparison.py

@@ -64,6 +64,8 @@ syntax_error_caret_re = re.compile(r"^\s*~*\^*~*$")
 
 timing_re = re.compile(r"in [0-9]+.[0-9][0-9](s| seconds)")
 
+did_you_mean_re = re.compile(r"\. Did you mean: '.*?'\?")
+
 
 def makeDiffable(output, ignore_warnings, syntax_errors):
     # Of course many cases to deal with,
@@ -177,6 +179,8 @@ def makeDiffable(output, ignore_warnings, syntax_errors):
 
         line = tempfile_re.sub(r"/tmp/tmpxxxxxxx", line)
 
+        line = did_you_mean_re.sub("", line)
+
         # This is a bug potentially, occurs only for CPython when re-directed,
         # we are going to ignore the issue as Nuitka is fine.
         if (

nuitka/tools/testing/Pythons.py

@@ -3,7 +3,6 @@
 
 """ Test tool to run a program with various Pythons. """
 
-
 from nuitka.PythonVersions import getSupportedPythonVersions
 from nuitka.utils.Execution import check_output
 from nuitka.utils.InstalledPythons import findPythons

nuitka/tools/testing/compare_with_cpython/__main__.py

@@ -220,7 +220,6 @@ def main():
     coverage_mode = hasArg("coverage")
     two_step_execution = hasArg("two_step_execution")
     binary_python_path = hasArg("binary_python_path")
-    keep_python_path = hasArg("keep_python_path")
     trace_command = (
         hasArg("trace_command") or os.getenv("NUITKA_TRACE_COMMANDS", "0") != "0"
     )
@@ -477,9 +476,6 @@ Taking coverage of '{filename}' using '{python}' with flags {args} ...""".format
     if binary_python_path:
         addToPythonPath(os.path.dirname(os.path.abspath(filename)))
 
-    if (keep_python_path or binary_python_path) and not coverage_mode:
-        extra_options.append("--execute-with-pythonpath")
-
     if report:
         extra_options.append("--report=%s" % report)
         deleteFile(report, must_exist=False)

nuitka/tools/watch/GitHub.py

@@ -17,7 +17,10 @@ from nuitka.utils.Execution import callProcess, check_call
 
 def checkInNuitkaWatch():
     remote_url = getRemoteURL("origin")
-    assert remote_url == "git@github.com:Nuitka/Nuitka-Watch.git", remote_url
+    assert remote_url in (
+        "git@github.com:Nuitka/Nuitka-Watch.git",
+        "https://github.com/Nuitka/Nuitka-Watch",
+    ), remote_url
     branch_name = getCurrentBranchName()
     assert branch_name == "main", branch_name
     assert os.path.exists(".git")

nuitka/tools/watch/__main__.py

@@ -467,9 +467,12 @@ def _updateCase(
 def updateCase(case_dir, case_data, dry_run, no_pipenv_update, nuitka_update_mode):
     case_name = case_data["case"]
 
+    watch_logger.info("Consider '%s' ... " % case_name)
+
     # Wrong OS maybe.
     os_name = selectOS(case_data["os"])
     if os_name is None:
+        watch_logger.info("  ... not on this OS")
         return
 
     nuitka_min_version = case_data.get("nuitka")
@@ -478,6 +481,20 @@ def updateCase(case_dir, case_data, dry_run, no_pipenv_update, nuitka_update_mod
     if nuitka_min_version is not None and _compareNuitkaVersions(
         nuitka_version, nuitka_min_version, consider_rc=False
     ):
+        watch_logger.info("  ... not for this Nuitka version")
+        return
+
+    selected_pythons = tuple(
+        selectPythons(
+            # TODO: Enable Anaconda support through options/detection.
+            anaconda="Anaconda" in os_name,
+            msys2_mingw64="MSYS2" in os_name,
+            python_version_req=case_data.get("python_version_req"),
+        )
+    )
+
+    if not selected_pythons:
+        watch_logger.info("  ... no suitable Python installations")
         return
 
     # For all relevant Pythons applicable to this case.
@@ -590,8 +607,12 @@ PR to create. Default not making a PR.""",
 
     assert len(positional_args) <= 1, positional_args
 
-    if positional_args and os.path.isdir(positional_args[0]):
+    if positional_args:
         base_dir = positional_args[0]
+
+        if not os.path.isdir(base_dir):
+            watch_logger.sysexit("Error, '%s' is not a directory" % base_dir)
+
     else:
         base_dir = os.getcwd()
 

nuitka/tree/Building.py

@@ -34,6 +34,7 @@ special attribute lookups for "__enter__" and "__exit__", calls of them,
 catching and passing in exceptions raised.
 
 """
+
 import marshal
 import os
 
@@ -139,6 +140,7 @@ from .ReformulationAssignmentStatements import (
     buildDeleteNode,
     buildInplaceAssignNode,
     buildNamedExprNode,
+    buildTypeAliasNode,
 )
 from .ReformulationBooleanExpressions import buildBoolOpNode
 from .ReformulationCallExpressions import buildCallNode
@@ -762,6 +764,7 @@ setBuildingDispatchers(
         "NamedExpr": buildNamedExprNode,
         "Slice": buildSliceNode,
         "Match": buildMatchNode,
+        "TypeAlias": buildTypeAliasNode,
     },
     path_args2={
         "Constant": buildNamedConstantNode,  # Python3.8

nuitka/tree/InternalModule.py

@@ -11,7 +11,6 @@ TODO: Clarify by renaming that the top module is now used, and these are
 merely helpers to do it.
 """
 
-
 from nuitka.ModuleRegistry import getRootTopModule
 from nuitka.nodes.FunctionNodes import (
     ExpressionFunctionPureBody,

nuitka/tree/ReformulationAssertStatements.py

@@ -7,6 +7,7 @@ Consult the Developer Manual for information. TODO: Add ability to sync
 source code comments with Developer Manual sections.
 
 """
+
 from nuitka.nodes.BuiltinRefNodes import ExpressionBuiltinExceptionRef
 from nuitka.nodes.ConditionalNodes import makeStatementConditional
 from nuitka.nodes.ContainerMakingNodes import makeExpressionMakeTuple

nuitka/tree/ReformulationAssignmentStatements.py

@@ -53,6 +53,7 @@ from nuitka.nodes.SubscriptNodes import (
     StatementAssignmentSubscript,
     StatementDelSubscript,
 )
+from nuitka.nodes.TypeNodes import ExpressionTypeAlias
 from nuitka.nodes.VariableAssignNodes import makeStatementAssignmentVariable
 from nuitka.nodes.VariableDelNodes import makeStatementDelVariable
 from nuitka.nodes.VariableNameNodes import (
@@ -76,6 +77,7 @@ from .SyntaxErrors import raiseSyntaxError
 from .TreeHelpers import (
     buildAnnotationNode,
     buildNode,
+    buildNodeTuple,
     getKind,
     makeStatementsSequence,
     makeStatementsSequenceFromStatement,
@@ -214,9 +216,11 @@ def buildAssignmentStatementsFromDecoded(provider, kind, detail, source, source_
             if element[0] == "Starred":
                 if starred_index is not None:
                     raiseSyntaxError(
-                        "two starred expressions in assignment"
-                        if python_version < 0x390
-                        else "multiple starred expressions in assignment",
+                        (
+                            "two starred expressions in assignment"
+                            if python_version < 0x390
+                            else "multiple starred expressions in assignment"
+                        ),
                         source_ref.atColumnNumber(0),
                     )
 
@@ -1247,6 +1251,25 @@ def buildNamedExprNode(provider, node, source_ref):
     return outline_body
 
 
+def buildTypeAliasNode(provider, node, source_ref):
+    """Python3.12 or higher, type alias statements."""
+
+    assert not node.type_params, node.type_params
+    type_alias_node = ExpressionTypeAlias(
+        type_params=buildNodeTuple(provider, node.type_params, source_ref),
+        compute_value=buildNode(provider, node.value, source_ref),
+        source_ref=source_ref,
+    )
+
+    # TODO: A specialized assignment statement might be in order
+    return StatementAssignmentVariableName(
+        provider=provider,
+        variable_name=mangleName(node.name.id, provider),
+        source=type_alias_node,
+        source_ref=source_ref,
+    )
+
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #