Nuitka-winsvc 2.3.11__cp311-cp311-win_amd64.whl → 2.4.5__cp311-cp311-win_amd64.whl

nuitka/plugins/standard/stdlib3.nuitka-package.config.yml

@@ -331,6 +331,12 @@
       change_function:
         'test': "'(lambda: None)'"
 
+- module-name: 'sysconfig' # checksum: f2059e78
+  anti-bloat:
+    - replacements:
+        'osname, host, release, version, machine = os.uname()': "'osname, host, release, version, machine = os.uname(); osname = %r' % os.uname()[0]"
+      when: 'not win32'
+
 - module-name: 'tabnanny' # checksum: 6a44b57d
   anti-bloat:
     - description: 'remove module ability to run as a binary'

nuitka/reports/Reports.py

@@ -16,6 +16,7 @@ from nuitka import TreeXML
 from nuitka.__past__ import unicode
 from nuitka.build.DataComposerInterface import getDataComposerReportValues
 from nuitka.build.SconsUtils import readSconsErrorReport
+from nuitka.code_generation.ConstantCodes import getDistributionMetadataValues
 from nuitka.containers.OrderedSets import OrderedSet
 from nuitka.freezer.IncludedDataFiles import getIncludedDataFiles
 from nuitka.freezer.IncludedEntryPoints import getStandaloneEntryPoints
@@ -37,10 +38,15 @@ from nuitka.Options import (
 from nuitka.OutputDirectories import (
     getResultRunFilename,
     getSourceDirectoryPath,
+    hasMainModule,
 )
 from nuitka.plugins.Plugins import getActivePlugins
 from nuitka.PythonFlavors import getPythonFlavorName
-from nuitka.PythonVersions import getSystemPrefixPath, python_version_full_str
+from nuitka.PythonVersions import (
+    getLaunchingSystemPrefixPath,
+    getSystemPrefixPath,
+    python_version_full_str,
+)
 from nuitka.Tracing import ReportingSystemExit, reports_logger
 from nuitka.utils.Distributions import (
     getDistributionInstallerName,
@@ -185,6 +191,11 @@ def _getReportInputData(aborted):
 
         module_exclusions[_using_module_name][_module_name] = _reason
 
+    included_metadata = dict(
+        (distribution_name, meta_data_value.reasons)
+        for distribution_name, meta_data_value in getDistributionMetadataValues()
+    )
+
     memory_infos = getMemoryInfos()
 
     python_exe = sys.executable
@@ -214,9 +225,16 @@ def _getReportInputData(aborted):
 
     data_composer = getDataComposerReportValues()
 
-    output_run_filename = os.path.abspath(getResultRunFilename(onefile=isOnefileMode()))
-
-    scons_error_report_data = readSconsErrorReport(source_dir=getSourceDirectoryPath())
+    if hasMainModule():
+        output_run_filename = os.path.abspath(
+            getResultRunFilename(onefile=isOnefileMode())
+        )
+        scons_error_report_data = readSconsErrorReport(
+            source_dir=getSourceDirectoryPath()
+        )
+    else:
+        scons_error_report_data = {}
+        output_run_filename = "failed too early"
 
     return dict(
         (var_name, var_value)
@@ -236,7 +254,7 @@ def _getReportPathPrefixes():
     if _report_prefixes is None:
         _report_prefixes = []
 
-        sys_prefix = os.getenv("NUITKA_SYS_PREFIX", sys.prefix)
+        sys_prefix = getLaunchingSystemPrefixPath() or sys.prefix
         real_sys_prefix = getSystemPrefixPath()
 
         if real_sys_prefix != sys_prefix:
@@ -333,6 +351,20 @@ def _addModulesToReport(root, report_input_data, diffable):
                 "volatile" if diffable else "%.2f" % timing_info.time_used
             )
 
+            if timing_info.micro_passes:
+                timing_xml_node.attrib["micro_passes"] = str(timing_info.micro_passes)
+
+            if timing_info.merge_counts:
+                merged_total = 0
+
+                for branch_count, merge_count in timing_info.merge_counts.items():
+                    merged_total += branch_count * merge_count
+
+                max_merge_size = max(timing_info.merge_counts)
+
+                timing_xml_node.attrib["max_branch_merge"] = str(max_merge_size)
+                timing_xml_node.attrib["merged_total"] = str(merged_total)
+
             module_xml_node.append(timing_xml_node)
 
         distributions = report_input_data["module_distribution_usages"][module_name]
@@ -565,6 +597,22 @@ def writeCompilationReport(report_filename, report_input_data, diffable):
                 tags=",".join(included_datafile.tags),
             )
 
+    if report_input_data["included_metadata"]:
+        metadata_node = TreeXML.appendTreeElement(
+            root,
+            "metadata",
+        )
+
+        for distribution_name, reasons in sorted(
+            report_input_data["included_metadata"].items()
+        ):
+            TreeXML.appendTreeElement(
+                metadata_node,
+                "included_metadata",
+                name=distribution_name,
+                reason=". ".join(reasons),
+            )
+
     for standalone_entry_point in getStandaloneEntryPoints():
         if standalone_entry_point.kind == "executable":
             continue

nuitka/specs/BuiltinParameterSpecs.py

@@ -736,7 +736,7 @@ class BuiltinMethodParameterSpecBase(BuiltinParameterSpec):
     ):
         BuiltinParameterSpec.__init__(
             self,
-            name="bytes." + name,
+            name=self.method_prefix + "." + name,
             arg_names=arg_names,
             default_count=default_count,
             list_star_arg=list_star_arg,

nuitka/specs/HardImportSpecs.py

@@ -168,12 +168,6 @@ ctypes_cdll_before_38_spec = BuiltinParameterSpec(
     default_count=4,
 )
 
-builtins_open_since_3_spec = BuiltinParameterSpec(
-    "builtins.open",
-    ("file", "mode", "buffering", "encoding", "errors", "newline", "closefd", "opener"),
-    default_count=7,
-)
-
 sys_exit_spec = BuiltinParameterSpecNoKeywords(
     "sys.exit", ("exit_code",), default_count=1
 )

nuitka/tools/data_composer/DataComposer.py

@@ -14,12 +14,7 @@ from nuitka.__past__ import BytesIO, long, to_byte, unicode, xrange
 from nuitka.build.DataComposerInterface import deriveModuleConstantsBlobName
 from nuitka.Builtins import builtin_exception_values_list, builtin_named_values
 from nuitka.containers.OrderedDicts import OrderedDict
-from nuitka.PythonVersions import (
-    isPythonValidCLongLongValue,
-    isPythonValidCLongValue,
-    python_version,
-    sizeof_clonglong,
-)
+from nuitka.PythonVersions import python_version
 from nuitka.Serialization import (
     BlobData,
     BuiltinAnonValue,
@@ -33,6 +28,7 @@ from nuitka.utils.FileOperations import getFileSize, listDir, syncFileOutput
 from nuitka.utils.Json import writeJsonToFilename
 
 _max_uint64_t_value = 2**64 - 1
+_max_uint31_t_value = 2**31 - 1
 
 
 def _encodeVariableLength(value):
@@ -134,34 +130,36 @@ def _writeConstantValue(output, constant_value):
         for element in constant_value:
             _writeConstantValue(output, element)
     elif constant_type is long:
-        if isPythonValidCLongValue(constant_value):
-            output.write(b"l" + struct.pack("l", constant_value))
-        elif isPythonValidCLongLongValue(constant_value):
-            output.write(b"q" + struct.pack("q", constant_value))
-        else:
-            output.write(b"g")
+        is_negative = constant_value < 0
+        abs_constant_value = abs(constant_value)
 
-            if constant_value < 0:
-                abs_constant_value = abs(constant_value)
-                output.write(b"-")
-            else:
-                abs_constant_value = constant_value
-                output.write(b"+")
+        if abs_constant_value < _max_uint31_t_value:
+            output.write(
+                (b"q" if is_negative else b"l")
+                + _encodeVariableLength(abs_constant_value)
+            )
+        else:
+            output.write(b"G" if is_negative else b"g")
 
             parts = []
 
-            mod_value = 2 ** (sizeof_clonglong * 8)
+            mod_value = 2**31
             while abs_constant_value > 0:
                 parts.append(abs_constant_value % mod_value)
-                abs_constant_value >>= sizeof_clonglong * 8
+                abs_constant_value >>= 31
 
-            output.write(struct.pack("i", len(parts)))
+            output.write(_encodeVariableLength(len(parts)))
             for part in reversed(parts):
-                output.write(struct.pack("Q", part))
+                output.write(_encodeVariableLength(part))
 
     elif constant_type is int:
-        # This is Python2 then. TODO: Special case smaller values.
-        output.write(b"i" + struct.pack("l", constant_value))
+        is_negative = constant_value < 0
+        abs_constant_value = abs(constant_value)
+        # This is Python2 then.
+
+        output.write(
+            (b"I" if is_negative else b"i") + _encodeVariableLength(abs_constant_value)
+        )
     elif constant_type is float:
         if constant_value == 0.0:
             if copysign(1, constant_value) == 1:
@@ -227,6 +225,8 @@ def _writeConstantValue(output, constant_value):
         _writeConstantValue(output, constant_value.step)
     elif constant_type is xrange:
         output.write(b";")
+        _last_written = None
+
         range_args = [
             int(v)
             for v in str(constant_value)[7 if str is bytes else 6 : -1].split(",")
@@ -240,7 +240,9 @@ def _writeConstantValue(output, constant_value):
         if len(range_args) < 3:
             range_args.append(1)
 
-        output.write(struct.pack("lll", *range_args))
+        _writeConstantValue(output, range_args[0])
+        _writeConstantValue(output, range_args[1])
+        _writeConstantValue(output, range_args[2])
     elif constant_type is complex:
         # Some float values do not transport well, use float streaming then.
         if (
@@ -275,10 +277,10 @@ def _writeConstantValue(output, constant_value):
     elif constant_type is BlobData:
         constant_value = constant_value.getData()
         output.write(b"X")
-        output.write(struct.pack("i", len(constant_value)))
+        output.write(_encodeVariableLength(len(constant_value)))
         output.write(constant_value)
     elif constant_type is BuiltinGenericAliasValue:
-        output.write(b"G")
+        output.write(b"A")
         _last_written = None
         _writeConstantValue(output, constant_value.origin)
         _writeConstantValue(output, constant_value.args)

nuitka/tools/environments/CreateEnvironment.py

@@ -37,6 +37,7 @@ def createEnvironmentFromReport(environment_folder, report_filename):
 
     with withVirtualenv(
         os.path.basename(environment_folder),
+        logger=tools_logger,
         base_dir=containing_folder,
         style="blue",
         delete=False,

nuitka/tools/environments/Virtualenv.py

@@ -10,7 +10,6 @@ import sys
 from contextlib import contextmanager
 
 from nuitka.__past__ import unicode
-from nuitka.Tracing import my_print
 from nuitka.utils.Execution import (
     NuitkaCalledProcessError,
     check_call,
@@ -25,8 +24,9 @@ from nuitka.utils.FileOperations import (
 
 
 class Virtualenv(object):
-    def __init__(self, env_dir):
+    def __init__(self, env_dir, logger):
         self.env_dir = os.path.abspath(env_dir)
+        self.logger = logger
 
     def runCommand(self, commands, env=None, style=None):
         if type(commands) in (str, unicode):
@@ -41,12 +41,14 @@ class Virtualenv(object):
             command = " && ".join(commands)
 
             if style is not None:
-                my_print("Executing: %s" % command, style=style)
+                self.logger.info("Executing: %s" % command, style=style)
 
             with withEnvironmentVarsOverridden(env):
                 exit_code = os.system(command)
                 if exit_code != 0:
-                    my_print("Failure %s for: %s" % (exit_code, command), style=style)
+                    self.logger.info(
+                        "Failure %s for: %s" % (exit_code, command), style=style
+                    )
 
                     raise NuitkaCalledProcessError(
                         exit_code, command, output=None, stderr=None
@@ -69,7 +71,7 @@ class Virtualenv(object):
             command = " && ".join(commands)
 
             if style is not None:
-                my_print("Executing: %s" % command, style=style)
+                self.logger.info("Executing: %s" % command, style=style)
 
             # Use subprocess and also return outputs, stdout, stderr, result
             return executeProcess(
@@ -82,14 +84,16 @@ class Virtualenv(object):
 
 
 @contextmanager
-def withVirtualenv(env_name, base_dir=None, python=None, delete=True, style=None):
+def withVirtualenv(
+    env_name, logger, base_dir=None, python=None, delete=True, style=None
+):
     """Create a virtualenv and change into it.
 
     Activating for actual use will be your task.
     """
 
     if style is not None:
-        my_print("Creating a virtualenv:")
+        logger.info("Creating a virtualenv:")
 
     if python is None:
         python = sys.executable
@@ -105,19 +109,29 @@ def withVirtualenv(env_name, base_dir=None, python=None, delete=True, style=None
     else:
         env_dir = env_name
 
-    removeDirectory(env_dir, ignore_errors=False)
+    removeDirectory(
+        env_dir,
+        logger=logger,
+        ignore_errors=False,
+        extra_recommendation=None,
+    )
 
     with withDirectoryChange(base_dir, allow_none=True):
         command = [python, "-m", "virtualenv", env_name]
         if style is not None:
-            my_print("Executing: %s" % " ".join(command), style=style)
+            logger.info("Executing: %s" % " ".join(command), style=style)
         check_call(command)
 
     try:
-        yield Virtualenv(env_dir)
+        yield Virtualenv(env_dir, logger=logger)
     finally:
         if delete:
-            removeDirectory(env_dir, ignore_errors=False)
+            removeDirectory(
+                env_dir,
+                logger=logger,
+                ignore_errors=False,
+                extra_recommendation=None,
+            )
 
 
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and

nuitka/tools/general/find_module/FindModuleCode.py

@@ -45,6 +45,7 @@ def editModuleCode(module_search_desc):
 
             candidate = module_search_desc
 
+            # spell-checker: ignore ONEFIL
             while not candidate.endswith(".DIS") and not os.path.basename(
                 candidate
             ).startswith("ONEFIL"):
@@ -62,14 +63,23 @@ def editModuleCode(module_search_desc):
 
             candidate = module_search_desc
 
-            while not candidate.endswith(".dist"):
+            while not candidate.endswith(".dist") and candidate:
                 candidate = os.path.dirname(candidate)
 
-            module_name = relpath(module_search_desc, start=candidate).replace("/", ".")
+            if candidate:
+                module_name = relpath(module_search_desc, start=candidate).replace(
+                    "/", "."
+                )
+            else:
+                module_name = None
     else:
         module_name = ModuleName(module_search_desc)
 
-    if module_name is not None:
+    if module_name is None:
+        tools_logger.sysexit(
+            "Error, did not find module for '%s' " % module_search_desc
+        )
+    else:
         addMainScriptDirectory(os.getcwd())
         module_filename = findModuleCode(module_name)
 

nuitka/tools/onefile_compressor/OnefileCompressor.py

@@ -20,7 +20,12 @@ from nuitka.Progress import (
 )
 from nuitka.Tracing import onefile_logger
 from nuitka.utils.AppDirs import getCacheDir
-from nuitka.utils.FileOperations import getFileList, getFileSize, makePath
+from nuitka.utils.FileOperations import (
+    areSamePaths,
+    getFileList,
+    getFileSize,
+    makePath,
+)
 from nuitka.utils.Hashing import Hash, HashCRC32
 from nuitka.utils.Utils import (
     decoratorRetries,
@@ -206,6 +211,20 @@ def _getCacheFilename(binary_filename, low_memory):
     return os.path.join(cache_dir, hash_value.asHexDigest())
 
 
+def _getInputFileList(dist_dir, start_binary):
+    file_list = getFileList(dist_dir, normalize=False)
+    file_list_size = len(file_list)
+    file_list = [
+        filename for filename in file_list if not areSamePaths(filename, start_binary)
+    ]
+    file_list.insert(0, start_binary)
+
+    # If this fails, above code failed to find the start binary.
+    assert file_list_size == len(file_list)
+
+    return tuple(file_list)
+
+
 def attachOnefilePayload(
     dist_dir,
     onefile_output_filename,
@@ -236,9 +255,7 @@ def attachOnefilePayload(
             output_file.write(b"KA" + compression_indicator)
 
             # Move the binary to start immediately to the start position
-            file_list = getFileList(dist_dir, normalize=False)
-            file_list.remove(start_binary)
-            file_list.insert(0, start_binary)
+            file_list = _getInputFileList(dist_dir=dist_dir, start_binary=start_binary)
 
             if isWin32Windows():
                 filename_encoding = "utf-16le"

nuitka/tools/scanning/DisplayPackageDLLs.py

@@ -14,8 +14,12 @@ from nuitka.importing.Importing import (
     locateModule,
 )
 from nuitka.Tracing import tools_logger
+from nuitka.tree.SourceHandling import readSourceCodeFromFilename
 from nuitka.utils.FileOperations import listDllFilesFromDirectory, relpath
-from nuitka.utils.Importing import getSharedLibrarySuffixes
+from nuitka.utils.Importing import (
+    getPackageDirFilename,
+    getSharedLibrarySuffixes,
+)
 from nuitka.utils.ModuleNames import ModuleName
 from nuitka.utils.SharedLibraries import getDllExportedSymbols
 from nuitka.utils.Utils import isMacOS
@@ -56,7 +60,7 @@ def displayDLLs(module_name):
     if not hasMainScriptDirectory():
         addMainScriptDirectory(os.getcwd())
 
-    module_name, package_directory, _module_kind, finding = locateModule(
+    module_name, package_directory, module_kind, finding = locateModule(
         module_name=module_name, parent_package=None, level=0
     )
 
@@ -71,12 +75,22 @@ def displayDLLs(module_name):
             % module_name.asString()
         )
 
+    from nuitka.plugins.Plugins import activatePlugins
+
+    activatePlugins()
+
+    if module_kind != "extension":
+        package_filename = getPackageDirFilename(package_directory)
+
+        if package_filename is not None:
+            readSourceCodeFromFilename(module_name, package_filename, pre_load=False)
+
     tools_logger.info("Checking package directory '%s' .. " % package_directory)
 
     count = 0
 
     for package_dll_dir in getPackageSpecificDLLDirectories(
-        module_name, consider_plugins=False
+        module_name, consider_plugins=True
     ):
         first = True
 

nuitka/tools/specialize/CTypeDescriptions.py

@@ -344,7 +344,7 @@ class TypeDescBase(getMetaClassBase("Type", require_slots=False)):
             # for at least "LONG", maybe others. spell-checker: ignore RICHCOMPARE
 
             assert self is object_desc, self
-            return "RICHCOMPARE(%s)" % operand
+            return "TP_RICHCOMPARE(%s)" % operand
         elif slot == "tp_compare":
             return operand + "->tp_compare"
         else:
@@ -387,15 +387,21 @@ class TypeDescBase(getMetaClassBase("Type", require_slots=False)):
         pass
 
     @staticmethod
-    def getOperationErrorMessageName(operator):
-        if operator == "%":
-            return "%%"
-        elif operator == "**":
+    def getOperationErrorMessageName(operator, inplace):
+        operator = operator.replace("%", "%%")
+
+        if operator == "**" and not inplace:
             return "** or pow()"
         elif operator == "divmod":
+            assert not inplace
             return "divmod()"
-        else:
-            return operator
+
+        assert "=" not in operator, operator
+
+        if inplace:
+            operator = operator + "="
+
+        return operator
 
     def getReturnUnorderableTypeErrorCode(
         self, operator, left, right, operand1, operand2

nuitka/tools/specialize/SpecializePython.py

@@ -249,6 +249,16 @@ lambda source_ref: wrapExpressionWithNodeSideEffects(
 )
 """
 
+attribute_shape_empty[
+    "fromkeys", "tshape_dict"
+] = """
+lambda source_ref: makeRaiseExceptionReplacementExpression(
+    expression=dict_arg,
+    exception_type="TypeError",
+    exception_value=getDictFromkeysNoArgErrorMessage(),
+)
+"""
+
 
 def emitGenerationWarning(emit, doc_string, template_name):
     generate_names = set()
@@ -358,7 +368,12 @@ def makeAttributeNodes():
 
         emit("from nuitka.nodes.ConstantRefNodes import makeConstantRefNode")
         emit(
-            "from nuitka.nodes.NodeMakingHelpers import wrapExpressionWithNodeSideEffects"
+            """\
+from nuitka.nodes.NodeMakingHelpers import (
+    wrapExpressionWithNodeSideEffects,
+    makeRaiseExceptionReplacementExpression
+)
+            """
         )
 
         emit(
@@ -367,6 +382,8 @@ def makeAttributeNodes():
 
         emit("from nuitka.nodes.AttributeNodes import makeExpressionAttributeLookup")
 
+        emit("from nuitka.PythonVersions import getDictFromkeysNoArgErrorMessage")
+
         # TODO: Maybe generate its effect instead of using a base class.
         emit("from .NodeBases import SideEffectsFromChildrenMixin")
 

nuitka/tools/testing/Common.py

@@ -211,7 +211,12 @@ def getTempDir():
         )
 
         def removeTempDir():
-            removeDirectory(path=tmp_dir, ignore_errors=True)
+            removeDirectory(
+                path=tmp_dir,
+                logger=test_logger,
+                ignore_errors=True,
+                extra_recommendation=None,
+            )
 
         atexit.register(removeTempDir)
 
@@ -370,7 +375,12 @@ def _removeCPythonTestSuiteDir():
     # Cleanup, some tests apparently forget that.
     try:
         if os.path.isdir("@test"):
-            removeDirectory("@test", ignore_errors=False)
+            removeDirectory(
+                "@test",
+                logger=test_logger,
+                ignore_errors=False,
+                extra_recommendation=None,
+            )
         elif os.path.isfile("@test"):
             os.unlink("@test")
     except OSError:
@@ -1329,6 +1339,8 @@ def checkTestRequirements(filename):
 
         if os.path.isfile(candidate):
             filename = candidate
+        else:
+            filename = os.path.join(filename, getMainProgramFilename(filename))
 
     for line in readSourceCodeFromFilename(None, filename).splitlines():
         if line.startswith("# nuitka-skip-unless-"):
@@ -1786,6 +1798,7 @@ def checkLoadedFileAccesses(loaded_filenames, current_dir):
             "libssl.1.0.0.dylib",
             "libcrypto.1.1.dylib",
             "libffi.dylib",
+            "libfribidi.dylib",
         ):
             continue
 
@@ -1800,10 +1813,7 @@ def checkLoadedFileAccesses(loaded_filenames, current_dir):
         if isMacOS():
             ignore = True
             for ignored_dir in (
-                "/System/Library/PrivateFrameworks",
-                "/System/Library/CoreServices",
-                "/System/Library/Frameworks/",
-                "/System/Library/dyld",
+                "/System/Library",
                 "/AppleInternal",
                 "/System/Volumes/Preboot",
                 "/usr/lib/system/",
@@ -1815,6 +1825,9 @@ def checkLoadedFileAccesses(loaded_filenames, current_dir):
             if not ignore:
                 continue
 
+            if loaded_filename == "/System/Library":
+                continue
+
             if loaded_filename == "/usr/libexec/rosetta/runtime":
                 continue
 

nuitka/tools/testing/check_reference_counts/__main__.py

@@ -2,7 +2,7 @@
 #     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
-""" Tool to compare reference counting behaviour of CPython and Nuitka.
+""" Tool to compare reference counting behavior of CPython and Nuitka.
 
 """