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

nuitka/plugins/PluginBase.py

@@ -187,9 +187,9 @@ def _getEvaluationContext():
             numeric_version = int(big) * 256 + int(major) * 16
             is_same_or_higher_version = python_version >= numeric_version
 
-            _context_dict[
-                "python" + big + major + "_or_higher"
-            ] = is_same_or_higher_version
+            _context_dict["python" + big + major + "_or_higher"] = (
+                is_same_or_higher_version
+            )
             _context_dict["before_python" + big + major] = not is_same_or_higher_version
 
         _context_dict["before_python3"] = python_version < 0x300
@@ -210,6 +210,8 @@ def _convertVersionToTuple(version_str):
 
 
 def _getPackageNameFromDistributionName(distribution_name):
+    # spell-checker: ignore opencv, pyobjc, objc
+
     if distribution_name in ("opencv-python", "opencv-python-headless"):
         return "cv2"
     elif distribution_name == "pyobjc":
@@ -302,7 +304,7 @@ def _iterate_module_names(package_name):
         module_name = package_name.getChildNamed(module_info.name)
         result.append(module_name.asString())
 
-        if module_info.ispkg:
+        if module_info.ispkg:  # spell-checker: ignore ispkg
             result.extend(_iterate_module_names(package_name=module_name))
 
     return result
@@ -1675,6 +1677,26 @@ class NuitkaYamlPluginBase(NuitkaPluginBase):
                     if decide_relevant(key, value):
                         yield key, value
 
+    def getYamlConfigItemSet(
+        self, module_name, section, item_name, decide_relevant, recursive
+    ):
+        for item_config in self.getYamlConfigItem(
+            module_name=module_name,
+            section=section,
+            item_name=item_name,
+            decide_relevant=None,
+            default=(),
+            recursive=recursive,
+        ):
+            if recursive:
+                for value in item_config[1]:
+                    if decide_relevant is None or decide_relevant(value):
+                        yield item_config[0], value
+            else:
+                for value in item_config:
+                    if decide_relevant is None or decide_relevant(value):
+                        yield value
+
 
 def standalone_only(func):
     """For plugins that have functionality that should be done in standalone mode only."""

nuitka/plugins/Plugins.py

@@ -25,6 +25,7 @@ from nuitka.__past__ import basestring, iter_modules
 from nuitka.build.DataComposerInterface import deriveModuleConstantsBlobName
 from nuitka.containers.OrderedDicts import OrderedDict
 from nuitka.containers.OrderedSets import OrderedSet
+from nuitka.Errors import NuitkaSyntaxError
 from nuitka.freezer.IncludedDataFiles import IncludedDataFile
 from nuitka.freezer.IncludedEntryPoints import IncludedEntryPoint
 from nuitka.ModuleRegistry import addUsedModule
@@ -811,7 +812,6 @@ class Plugins(object):
     def onModuleDiscovered(cls, module):
         # We offer plugins many ways to provide extra stuff
         # pylint: disable=too-many-locals,too-many-statements
-
         full_name = module.getFullName()
 
         def _untangleLoadDescription(description):
@@ -854,6 +854,12 @@ class Plugins(object):
         post_module_load_descriptions = []
         fake_module_descriptions = []
 
+        if module.isMainModule():
+            plugin = None
+            pre_module_load_descriptions.extend(
+                _untangleLoadDescription(_getMainModulePreloadCodes())
+            )
+
         for plugin in getActivePlugins():
             plugin.onModuleDiscovered(module)
 
@@ -1052,17 +1058,26 @@ class Plugins(object):
             if not os.path.isfile(source_filename):
                 return None
 
-            return readSourceCodeFromFilename(
-                module_name=module_name, source_filename=source_filename, pre_load=True
-            )
+            try:
+                return readSourceCodeFromFilename(
+                    module_name=module_name,
+                    source_filename=source_filename,
+                    pre_load=True,
+                )
+            except SyntaxError as e:
+                # Look ahead just not possible.
+                raise NuitkaSyntaxError(e)
 
-        for plugin in getActivePlugins():
-            plugin.onModuleUsageLookAhead(
-                module_name=module_name,
-                module_filename=module_filename,
-                module_kind=module_kind,
-                get_module_source=getModuleSourceCode,
-            )
+        try:
+            for plugin in getActivePlugins():
+                plugin.onModuleUsageLookAhead(
+                    module_name=module_name,
+                    module_filename=module_filename,
+                    module_kind=module_kind,
+                    get_module_source=getModuleSourceCode,
+                )
+        except NuitkaSyntaxError:
+            pass
 
     @staticmethod
     def onModuleRecursion(
@@ -1423,7 +1438,7 @@ class Plugins(object):
         # Not a DLL filename, then it cannot be true, but it's kind of strange
         # to get asked.
         if dll_basename is None:
-            return False
+            return None, None
 
         result = None
         plugin_name = None
@@ -1779,6 +1794,28 @@ def isTriggerModule(module):
     return module in pre_modules.values() or module in post_modules.values()
 
 
+# TODO: Make this a dedicated thing generally.
+def _getMainModulePreloadCodes():
+    forced_runtime_env_variable_values = tuple(
+        Options.getForcedRuntimeEnvironmentVariableValues()
+    )
+    if not forced_runtime_env_variable_values:
+        return
+
+    result = ["import os"]
+
+    for (
+        forced_runtime_env_variable_name,
+        forced_runtime_env_variable_value,
+    ) in forced_runtime_env_variable_values:
+        result.append(
+            "os.environ['%s'] = '%s'"
+            % (forced_runtime_env_variable_name, forced_runtime_env_variable_value)
+        )
+
+    yield ("\n".join(result), "forcing environment variable(s)")
+
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #

nuitka/plugins/standard/AntiBloatPlugin.py

@@ -138,6 +138,14 @@ class NuitkaPluginAntiBloat(NuitkaYamlPluginBase):
                 noinclude_unittest_mode,
                 "unittest",
             )
+            self.handled_modules["keras.src.testing_infra"] = (
+                noinclude_unittest_mode,
+                "unittest",
+            )
+            self.handled_modules["tf_keras.src.testing_infra"] = (
+                noinclude_unittest_mode,
+                "unittest",
+            )
         else:
             self.control_tags["use_unittest"] = True
 
@@ -626,7 +634,7 @@ class %(class_name)s:
     def _applyNoFollowConfiguration(self, module_name):
         for (
             config_of_module_name,
-            no_follow,
+            no_follow_pattern,
             description,
         ) in self.getYamlConfigItemItems(
             module_name=module_name,
@@ -635,7 +643,7 @@ class %(class_name)s:
             decide_relevant=lambda key, value: True,
             recursive=True,
         ):
-            self.no_follows[no_follow] = (config_of_module_name, description)
+            self.no_follows[no_follow_pattern] = (config_of_module_name, description)
 
     def onModuleRecursion(
         self,
@@ -661,6 +669,8 @@ class %(class_name)s:
 
         # This will allow "unittest.mock" to pass "unittest". It's kind of a hack and
         # hopefully unusual.
+        if module_name == "unittest" and reason == "import path parent":
+            return
         if module_name == "unittest.mock" and module_name not in self.handled_modules:
             return
 

nuitka/plugins/standard/ConsiderPyLintAnnotationsPlugin.py

@@ -17,7 +17,6 @@ to grow both.
 
 """
 
-
 import re
 
 from nuitka.__past__ import intern

nuitka/plugins/standard/DataFilesPlugin.py

@@ -11,7 +11,7 @@ import pkgutil
 from nuitka import Options
 from nuitka.code_generation.ConstantCodes import addDistributionMetadataValue
 from nuitka.containers.OrderedSets import OrderedSet
-from nuitka.plugins.PluginBase import NuitkaPluginBase
+from nuitka.plugins.PluginBase import NuitkaYamlPluginBase
 from nuitka.PythonFlavors import isDebianPackagePython
 from nuitka.utils.Distributions import getDistribution
 from nuitka.utils.FileOperations import (
@@ -19,17 +19,13 @@ from nuitka.utils.FileOperations import (
     getFileList,
     resolveShellPatternToFilenames,
 )
-from nuitka.utils.Yaml import getYamlPackageConfiguration
 
 
-class NuitkaPluginDataFileCollector(NuitkaPluginBase):
+class NuitkaPluginDataFileCollector(NuitkaYamlPluginBase):
     plugin_name = "data-files"
 
     plugin_desc = "Include data files specified by package configuration files."
 
-    def __init__(self):
-        self.config = getYamlPackageConfiguration()
-
     @classmethod
     def isRelevant(cls):
         return Options.isStandaloneMode()

nuitka/plugins/standard/DillPlugin.py

@@ -34,10 +34,10 @@ Extending "dill" for compiled types to be pickle-able as well.""",
             return (
                 """\
 import sys
-sys.modules["%(module_name)s"]._create_compiled_function%(version)s = \
+sys.modules[__compiled__.main]._create_compiled_function%(version)s = \
     sys.modules["%(module_name)s-preLoad"]._create_compiled_function%(version)s
-sys.modules["%(module_name)s"]._create_compiled_function%(version)s.__module__ = \
-    "%(module_name)s"
+sys.modules[__compiled__.main]._create_compiled_function%(version)s.__module__ = \
+    __compiled__.main
 """
                 % {"module_name": full_name, "version": "2" if str is bytes else "3"},
                 """

nuitka/plugins/standard/DllFilesPlugin.py

@@ -13,7 +13,7 @@ import os
 import sys
 
 from nuitka.Options import isStandaloneMode
-from nuitka.plugins.PluginBase import NuitkaPluginBase
+from nuitka.plugins.PluginBase import NuitkaYamlPluginBase
 from nuitka.PythonVersions import python_version
 from nuitka.utils.Distributions import (
     getDistributionFromModuleName,
@@ -25,18 +25,14 @@ from nuitka.utils.FileOperations import (
     listExeFilesFromDirectory,
 )
 from nuitka.utils.SharedLibraries import getPyWin32Dir
-from nuitka.utils.Utils import isFreeBSD, isLinux, isWin32Windows
-from nuitka.utils.Yaml import getYamlPackageConfiguration
+from nuitka.utils.Utils import isFreeBSD, isLinux, isMacOS, isWin32Windows
 
 
-class NuitkaPluginDllFiles(NuitkaPluginBase):
+class NuitkaPluginDllFiles(NuitkaYamlPluginBase):
     plugin_name = "dll-files"
 
     plugin_desc = "Include DLLs as per package configuration files."
 
-    def __init__(self):
-        self.config = getYamlPackageConfiguration()
-
     @staticmethod
     def isAlwaysEnabled():
         return True
@@ -367,24 +363,38 @@ conditions are missing, or this version of the module needs treatment added."""
                         )
 
     def getModuleSpecificDllPaths(self, module_name):
-        for entry in self.config.get(module_name, section="import-hacks"):
-            if self.evaluateCondition(
-                full_name=module_name, condition=entry.get("when", "True")
-            ):
-                for item in self._getModuleSpecificDllPaths(config=entry):
-                    yield item
-
-    def _getModuleSpecificDllPaths(self, config):
-        for config_package_name in config.get("find-dlls-near-module", ()):
-            module_filename = self.locateModule(config_package_name)
+        for _config_module_name, near_module_name in self.getYamlConfigItemSet(
+            module_name=module_name,
+            section="import-hacks",
+            item_name="find-dlls-near-module",
+            decide_relevant=None,
+            recursive=True,
+        ):
+            module_filename = self.locateModule(near_module_name)
 
             if module_filename is not None:
                 if os.path.isfile(module_filename):
-                    yield os.path.dirname(module_filename)
+                    package_directory = os.path.dirname(module_filename)
                 else:
-                    yield module_filename
+                    package_directory = module_filename
+
+                yield package_directory
+
+                if isMacOS():
+                    # Some packages for macOS put their DLLs in a ".dylibs" folder,
+                    # consider those as well, spell-checker: ignore dylibs
+                    dylib_directory = os.path.join(package_directory, ".dylibs")
+
+                    if os.path.isdir(package_directory):
+                        yield dylib_directory
 
     def isAcceptableMissingDLL(self, package_name, dll_basename):
+        if package_name is None:
+            return None
+
+        # Config is to be attached to top level package.
+        package_name = package_name.getTopLevelPackageName()
+
         for entry in self.config.get(package_name, section="import-hacks"):
             if self.evaluateCondition(
                 full_name=package_name, condition=entry.get("when", "True")
@@ -409,10 +419,6 @@ conditions are missing, or this version of the module needs treatment added."""
     def decideAllowOutsideDependencies(self, module_name):
         distribution = None
 
-        assert module_name != "_ctypes", self.config.get(
-            module_name, section="import-hacks"
-        )
-
         while 1:
             for entry in self.config.get(module_name, section="import-hacks"):
                 if self.evaluateCondition(

nuitka/plugins/standard/GiPlugin.py

@@ -3,6 +3,7 @@
 
 """ Support for gi typelib files and DLLs
 """
+
 import os
 
 from nuitka.plugins.PluginBase import NuitkaPluginBase, standalone_only

nuitka/plugins/standard/ImplicitImports.py

@@ -15,13 +15,12 @@ import os
 from nuitka.__past__ import iter_modules, unicode
 from nuitka.importing.Importing import locateModule
 from nuitka.importing.Recursion import decideRecursion
-from nuitka.plugins.PluginBase import NuitkaPluginBase
+from nuitka.plugins.PluginBase import NuitkaYamlPluginBase
 from nuitka.utils.ModuleNames import ModuleName
 from nuitka.utils.Utils import isMacOS, isWin32Windows
-from nuitka.utils.Yaml import getYamlPackageConfiguration
 
 
-class NuitkaPluginImplicitImports(NuitkaPluginBase):
+class NuitkaPluginImplicitImports(NuitkaYamlPluginBase):
     plugin_name = "implicit-imports"
 
     plugin_desc = (
@@ -29,7 +28,7 @@ class NuitkaPluginImplicitImports(NuitkaPluginBase):
     )
 
     def __init__(self):
-        self.config = getYamlPackageConfiguration()
+        NuitkaYamlPluginBase.__init__(self)
 
         self.lazy_loader_usages = {}
 
@@ -486,9 +485,11 @@ __file__ = (__nuitka_binary_dir + '%ssite.py') if '__nuitka_binary_dir' in dict(
 
         submodule_attrs = dict(
             (
-                module_name.getChildNamed(submodule[1:])
-                if submodule.startswith(".")
-                else ModuleName(submodule),
+                (
+                    module_name.getChildNamed(submodule[1:])
+                    if submodule.startswith(".")
+                    else ModuleName(submodule)
+                ),
                 tuple(attribute_names),
             )
             for (submodule, attribute_names) in sorted(submodule_attrs.items())
@@ -660,6 +661,7 @@ According to Yaml 'overridden-environment-variables' configuration."""
         "rich",  #  Not performance relevant and memory leaking due to empty compiled cell leaks
         "altair.vegalite.v5.schema",  # Not performance relevant.
         "azure",  # Not performance relevant.
+        "networkx",  # Needs solutions for bytecode requiring decorators.
     )
 
     unworthy_modulename_patterns = (

nuitka/plugins/standard/MatplotlibPlugin.py

@@ -2,6 +2,7 @@
 
 
 """ Matplotlib standard plugin module. """
+
 import os
 
 from nuitka.Options import isStandaloneMode

nuitka/plugins/standard/OptionsNannyPlugin.py

@@ -15,21 +15,17 @@ from nuitka.Options import (
     shallCreateAppBundle,
     shallDisableConsoleWindow,
 )
-from nuitka.plugins.PluginBase import NuitkaPluginBase
+from nuitka.plugins.PluginBase import NuitkaYamlPluginBase
 from nuitka.utils.Utils import isMacOS
-from nuitka.utils.Yaml import getYamlPackageConfiguration
 
 
-class NuitkaPluginOptionsNanny(NuitkaPluginBase):
+class NuitkaPluginOptionsNanny(NuitkaYamlPluginBase):
     plugin_name = "options-nanny"
 
     plugin_desc = (
         "Inform the user about potential problems as per package configuration files."
     )
 
-    def __init__(self):
-        self.config = getYamlPackageConfiguration()
-
     @staticmethod
     def isAlwaysEnabled():
         return True
@@ -52,7 +48,7 @@ class NuitkaPluginOptionsNanny(NuitkaPluginBase):
         else:
             if condition != "True":
                 problem_desc = (
-                    " with incomplete support due to untrue condition '%s'" % condition
+                    " with incomplete support due to condition '%s'" % condition
                 )
             else:
                 problem_desc = " with incomplete support"

nuitka/plugins/standard/PkgResourcesPlugin.py

@@ -8,7 +8,6 @@ runtime, but that is done by nodes and optimization. But there are other things,
 that need special case, e.g. the registration of the loader class.
 """
 
-
 import re
 
 from nuitka.plugins.PluginBase import NuitkaPluginBase

nuitka/plugins/standard/PmwPlugin.py

@@ -19,7 +19,7 @@ from nuitka.utils.FileOperations import getFileContents, listDir
 
 # The order of these files is significant.  Files which reference
 # other files must appear later.  Files may be deleted if they are not
-# used.
+# used. spell-checker: ignore TimeFuncs
 files = [
     "Dialog",
     "TimeFuncs",
@@ -93,7 +93,7 @@ Should 'Pmw.Color' not be included, Default is to include it.""",
         return source_code
 
     def _packagePmw(self, pmw_path):
-        self.info("Packaging Pmw into single module fpor freezing.")
+        self.info("Packaging Pmw into single module for freezing.")
 
         # Algorithm is from the "__init__.py" of Pwm:
 
@@ -131,12 +131,12 @@ Should 'Pmw.Color' not be included, Default is to include it.""",
 
         return self._packagePmw2(candidate, version)
 
-    def _packagePmw2(self, srcdir, version):
-        def mungeFile(filename):
+    def _packagePmw2(self, src_dir, version):
+        def treatFile(filename):
             # Read the filename and modify it so that it can be bundled with the
-            # other Pmw files.
+            # other Pmw files. spell-checker: ignore INITOPT
             filename = "Pmw" + filename + ".py"
-            text = getFileContents(os.path.join(srcdir, filename))
+            text = getFileContents(os.path.join(src_dir, filename))
             text = re.sub(r"import Pmw\>", "", text)
             text = re.sub("INITOPT = Pmw.INITOPT", "", text)
             text = re.sub(r"\<Pmw\.", "", text)
@@ -155,12 +155,13 @@ from . import PmwBlt
 Blt = PmwBlt
 del PmwBlt
 """
-        # Code used when not linking with PmwBlt.py.
+        # Code used when not linking with PmwBlt.py, spell-checker: ignore _bltbusyOK
         ignore_blt_code = """
 _bltImported = 1
 _bltbusyOK = 0
 """
         # Code to define the functions normally supplied by the dynamic loader.
+        # spell-checker: ignore setversion,setalphaversions,installedversions
         extra_code = """
 
 ### Loader functions:
@@ -200,7 +201,7 @@ def installedversions(alpha = 0):
         outfile.write(extra_code % version)
 
         # Specially handle PmwBase.py filename:
-        text = mungeFile("Base")
+        text = treatFile("Base")
         text = re.sub("from . import PmwLogicalFont", "", text)
         text = re.sub("import PmwLogicalFont", "", text)
         text = re.sub("PmwLogicalFont._font_initialise", "_font_initialise", text)
@@ -212,7 +213,7 @@ def installedversions(alpha = 0):
         files.append("LogicalFont")
 
         for filename in files:
-            text = mungeFile(filename)
+            text = treatFile(filename)
             outfile.write(text)
 
         return outfile.getvalue()

nuitka/plugins/standard/PySidePyQtPlugin.py

@@ -1045,34 +1045,6 @@ Prefix = .
                     reason="needed by '%s'" % full_name.asString(),
                 )
 
-    def removeDllDependencies(self, dll_filename, dll_filenames):
-        for value in self.getQtPluginDirs():
-            # TODO: That is not a proper check if a file is below that.
-            if dll_filename.startswith(value):
-                for sub_dll_filename in dll_filenames:
-                    for badword in (
-                        "libKF5",
-                        "libkfontinst",
-                        "libkorganizer",
-                        "libplasma",
-                        "libakregator",
-                        "libdolphin",
-                        "libnoteshared",
-                        "libknotes",
-                        "libsystemsettings",
-                        "libkerfuffle",
-                        "libkaddressbook",
-                        "libkworkspace",
-                        "libkmail",
-                        "libmilou",
-                        "libtaskmanager",
-                        "libkonsole",
-                        "libgwenview",
-                        "libweather_ion",
-                    ):
-                        if os.path.basename(sub_dll_filename).startswith(badword):
-                            yield sub_dll_filename
-
     def onModuleEncounter(
         self, using_module_name, module_name, module_filename, module_kind
     ):

nuitka/plugins/standard/TensorflowPlugin.py

@@ -3,6 +3,7 @@
 
 """ Deprecated tensorflow plugin.
 """
+
 from nuitka.plugins.PluginBase import NuitkaPluginBase
 
 

nuitka/plugins/standard/TorchPlugin.py

@@ -3,6 +3,7 @@
 
 """ Deprecated torch plugin.
 """
+
 from nuitka.plugins.PluginBase import NuitkaPluginBase
 
 

nuitka/plugins/standard/TrioPlugin.py

@@ -3,6 +3,7 @@
 
 """ Deprecated trio plugin.
 """
+
 from nuitka.plugins.PluginBase import NuitkaPluginBase