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

nuitka/plugins/standard/DillPlugin.py

@@ -1,24 +1,11 @@
-#     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
+
+
 """ Standard plug-in to make dill module work for compiled stuff.
 
 """
 
+from nuitka.Options import shallMakeModule
 from nuitka.plugins.PluginBase import NuitkaPluginBase
 
 
@@ -33,110 +20,36 @@ class NuitkaPluginDillWorkarounds(NuitkaPluginBase):
     def isAlwaysEnabled():
         return False
 
-    @staticmethod
-    def createPostModuleLoadCode(module):
+    def createPostModuleLoadCode(self, module):
         full_name = module.getFullName()
 
-        if full_name == "dill":
-            code = r"""\
-import dill._dill
-
-# Compiled methods need to be created.
-@dill.register(compiled_method)
-def save_compiled_method(pickler, obj):
-    if str is not bytes:
-        pickler.save_reduce(compiled_method, (obj.__func__, obj.__self__), obj=obj)
-    else:
-        pickler.save_reduce(compiled_method, (obj.im_func, obj.im_self, obj.im_class), obj=obj)
-
-def _create_compiled_function2(module_name, func_values, func_dict, func_defaults):
-    if module_name not in compiled_function_tables:
-        __import__(module_name)
-
-    func = compiled_function_tables[module_name][1](*func_values)
-    if func_dict:
-        for key, value in func_dict.items():
-            func[key] = value
-
-    func.__defaults__ = func_defaults
-
-    return func
-
-def _create_compiled_function3(module_name, func_values, func_dict, func_defaults, func_kwdefaults):
-    if module_name not in compiled_function_tables:
-        __import__(module_name)
-
-    func = compiled_function_tables[module_name][1](*func_values)
-    if func_dict:
-        for key, value in func_dict.items():
-            func[key] = value
-
-    func.__defaults__ = func_defaults
-    func.__kwdefaults__ = func_kwdefaults
-
-    return func
-
-
-# Compiled methods might have to be created or not.
-@dill.register(compiled_function)
-def save_compiled_function(pickler, obj):
-    if not dill._dill._locate_function(obj):
-        stack = dill._dill.stack
-
-        if getattr(pickler, '_recurse', False):
-            from dill.detect import globalvars
-            globs = globalvars(obj, recurse=True, builtin=True)
-            if id(obj) in stack:
-                globs = obj.__globals__ if str is not bytes else obj.func_globals
-        else:
-            globs = obj.__globals__ if str is not bytes else obj.func_globals
-
-        _byref = getattr(pickler, '_byref', None)
-        _recurse = getattr(pickler, '_recurse', None)
-        _memo = (id(obj) in stack) and (_recurse is not None)
-        stack[id(obj)] = len(stack), obj
-
-        if str is not bytes:
-            # Python3
-            _super = ('super' in getattr(obj.__code__,'co_names',())) and (_byref is not None)
-            if _super: pickler._byref = True
-            if _memo: pickler._recurse = False
-
-            pickler.save_reduce(
-                _create_compiled_function3,
-                (
-                    obj.__module__,
-                    compiled_function_tables[obj.__module__][0](obj),
-                    obj.__dict__,
-                    obj.__defaults__,
-                    obj.__kwdefaults__
-                )
-            )
-        else:
-            # Python2
-            _super = ('super' in getattr(obj.__code__,'co_names',())) and (_byref is not None) and getattr(pickler, '_recurse', False)
-            if _super: pickler._byref = True
-            if _memo: pickler._recurse = False
-
-            pickler.save_reduce(
-                _create_compiled_function2,
-                (
-                    obj.__module__,
-                    compiled_function_tables[obj.__module__][0](obj),
-                    obj.__dict__,
-                    obj.__defaults__
-                )
+        if full_name == "dill" and not shallMakeModule():
+            return (
+                self.getPluginDataFileContents("dill-postLoad.py"),
+                """\
+Extending "dill" for compiled types to be pickle-able as well.""",
             )
 
-        if _super: pickler._byref = _byref
-        if _memo: pickler._recurse = _recurse
-    else:
-        dill._dill.StockPickler.save_global(pickler, obj)
+        if shallMakeModule() and module.isTopModule():
+            return (
+                """\
+import sys
+sys.modules[__compiled__.main]._create_compiled_function%(version)s = \
+    sys.modules["%(module_name)s-preLoad"]._create_compiled_function%(version)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"},
+                """
+Extending "dill" for compiled types to be pickle-able as well.""",
+            )
+
+    def createPreModuleLoadCode(self, module):
+        if shallMakeModule() and module.isTopModule():
             return (
-                code,
+                self.getPluginDataFileContents("dill-postLoad.py"),
                 """\
-Extending "dill" for compiled types to be pickable as well.""",
+Extending "dill" for compiled types to be pickle-able as well.""",
             )
 
     @staticmethod
@@ -144,25 +57,20 @@ Extending "dill" for compiled types to be pickable as well.""",
         return {"_NUITKA_PLUGIN_DILL_ENABLED": "1"}
 
     def getExtraCodeFiles(self):
-        return {"DillPlugin.c": extra_code}
-
-
-extra_code = r"""
-#include "nuitka/prelude.h"
-
-void registerDillPluginTables(PyThreadState *tstate, char const *module_name, PyMethodDef *reduce_compiled_function, PyMethodDef *create_compiled_function) {
-    PyObject *function_tables = PyObject_GetAttrString((PyObject *)builtin_module, "compiled_function_tables");
-
-    if (function_tables == NULL) {
-        CLEAR_ERROR_OCCURRED(tstate);
+        return {"DillPlugin.c": self.getPluginDataFileContents("DillPlugin.c")}
 
-        function_tables = MAKE_DICT_EMPTY();
-        PyObject_SetAttrString((PyObject *)builtin_module, "compiled_function_tables", function_tables);
-    }
 
-    PyObject *funcs = MAKE_TUPLE2_0(PyCFunction_New(reduce_compiled_function, NULL), PyCFunction_New(create_compiled_function, NULL));
-
-    PyDict_SetItemString(function_tables, module_name, funcs);
-}
-
-"""
+#     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/plugins/standard/DllFilesPlugin.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
+
+
 """ Standard plug-in to tell Nuitka about DLLs needed for standalone imports.
 
 When DLLs are imported, we cannot see this and need to be told that. This
@@ -27,25 +13,26 @@ import os
 import sys
 
 from nuitka.Options import isStandaloneMode
-from nuitka.plugins.PluginBase import NuitkaPluginBase
+from nuitka.plugins.YamlPluginBase import NuitkaYamlPluginBase
 from nuitka.PythonVersions import python_version
+from nuitka.utils.Distributions import (
+    getDistributionFromModuleName,
+    getDistributionName,
+    isDistributionSystemPackage,
+)
 from nuitka.utils.FileOperations import (
     listDllFilesFromDirectory,
     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
@@ -54,14 +41,24 @@ class NuitkaPluginDllFiles(NuitkaPluginBase):
     def isRelevant():
         return isStandaloneMode()
 
-    def _handleDllConfigFromFilenames(self, dest_path, dll_config, full_name):
+    def _handleDllConfigFromFilenames(self, dll_config, full_name, dest_path):
+        # A lot of details here, pylint: disable=too-many-locals
+
         # The "when" is at that level too for these.
         if not self.evaluateCondition(
             full_name=full_name, condition=dll_config.get("when", "True")
         ):
             return
 
-        relative_path = dll_config.get("relative_path", ".")
+        config_name = "module '%s' DLL config" % full_name
+
+        relative_path = self.evaluateExpressionOrConstant(
+            full_name=full_name,
+            expression=dll_config.get("relative_path", "."),
+            config_name=config_name,
+            extra_context=None,
+            single_value=True,
+        )
 
         module_filename = self.locateModule(full_name)
 
@@ -81,9 +78,29 @@ class NuitkaPluginDllFiles(NuitkaPluginBase):
         if os.path.exists(dll_dir):
             exe = dll_config.get("executable", "no") == "yes"
 
-            suffixes = dll_config.get("suffixes")
+            suffixes = tuple(
+                self.evaluateExpressionOrConstant(
+                    full_name=full_name,
+                    expression=suffix,
+                    config_name=config_name,
+                    extra_context=None,
+                    single_value=True,
+                ).lstrip(".")
+                for suffix in dll_config.get("suffixes", ())
+            )
+
+            prefixes = tuple(
+                self.evaluateExpressionOrConstant(
+                    full_name=full_name,
+                    expression=prefix,
+                    config_name=config_name,
+                    extra_context=None,
+                    single_value=True,
+                ).lstrip(".")
+                for prefix in dll_config.get("prefixes", ())
+            )
 
-            for prefix in dll_config.get("prefixes"):
+            for prefix in prefixes:
                 if exe:
                     for exe_filename, filename in listExeFilesFromDirectory(
                         dll_dir, prefix=prefix, suffixes=suffixes
@@ -96,6 +113,7 @@ class NuitkaPluginDllFiles(NuitkaPluginBase):
                                     filename,
                                 )
                             ),
+                            module_name=full_name,
                             package_name=full_name,
                             reason="Yaml config of '%s'" % full_name.asString(),
                         )
@@ -111,6 +129,7 @@ class NuitkaPluginDllFiles(NuitkaPluginBase):
                                     filename,
                                 )
                             ),
+                            module_name=full_name,
                             package_name=full_name,
                             reason="Yaml config of '%s'" % full_name.asString(),
                         )
@@ -143,6 +162,7 @@ class NuitkaPluginDllFiles(NuitkaPluginBase):
             yield self.makeExeEntryPoint(
                 source_path=filename,
                 dest_path=dest_path,
+                module_name=full_name,
                 package_name=full_name,
                 reason="Yaml config of '%s'" % full_name.asString(),
             )
@@ -150,6 +170,7 @@ class NuitkaPluginDllFiles(NuitkaPluginBase):
             yield self.makeDllEntryPoint(
                 source_path=filename,
                 dest_path=dest_path,
+                module_name=full_name,
                 package_name=full_name,
                 reason="Yaml config of '%s'" % full_name.asString(),
             )
@@ -165,7 +186,7 @@ class NuitkaPluginDllFiles(NuitkaPluginBase):
         filename_code = dll_config.get("filename_code")
 
         filename = self.queryRuntimeInformationMultiple(
-            "%s_%s" % (full_name.asString().replace(".", "_"), count),
+            "%s_%s" % (full_name.asString(), count),
             setup_codes=setup_codes,
             values=(("filename", filename_code),),
         ).filename
@@ -239,7 +260,9 @@ conditions are missing, or this version of the module needs treatment added."""
                 full_name=full_name, condition=dll_config.get("when", "True")
             ):
                 for dll_entry_point in self._handleDllConfig(
-                    dll_config=dll_config, full_name=full_name, count=count
+                    dll_config=dll_config,
+                    full_name=full_name,
+                    count=count,
                 ):
                     yield dll_entry_point
                     found += 1
@@ -259,6 +282,7 @@ conditions are missing, or this version of the module needs treatment added."""
                 yield self.makeDllEntryPoint(
                     source_path=uuid_dll_path,
                     dest_path=os.path.basename(uuid_dll_path),
+                    module_name=full_name,
                     package_name=None,
                     reason="needed by uuid package",
                 )
@@ -271,6 +295,7 @@ conditions are missing, or this version of the module needs treatment added."""
             yield self.makeDllEntryPoint(
                 source_path=xtwrapper_dll_path,
                 dest_path=os.path.basename(xtwrapper_dll_path),
+                module_name=full_name,
                 package_name=None,
                 reason="needed by 'iptc'",
             )
@@ -280,6 +305,7 @@ conditions are missing, or this version of the module needs treatment added."""
                     module.getCompileTimeDirectory(), "libsecp256k1.dll"
                 ),
                 dest_path=os.path.join(full_name.getPackageName(), "libsecp256k1.dll"),
+                module_name=full_name,
                 package_name=full_name.getPackageName(),
                 reason="needed by 'coincurve._libsecp256k1'",
             )
@@ -333,29 +359,44 @@ conditions are missing, or this version of the module needs treatment added."""
                         yield self.makeDllEntryPoint(
                             source_path=pythoncom_dll_path,
                             dest_path=pythoncom_filename,
+                            module_name=full_name,
                             package_name=None,
                             reason="needed by '%s'" % full_name.asString(),
                         )
 
     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")
@@ -376,3 +417,45 @@ conditions are missing, or this version of the module needs treatment added."""
                 return True
 
         return None
+
+    def decideAllowOutsideDependencies(self, module_name):
+        distribution = None
+
+        while 1:
+            for entry in self.config.get(module_name, section="import-hacks"):
+                if self.evaluateCondition(
+                    full_name=module_name, condition=entry.get("when", "True")
+                ):
+                    if "package-system-dlls" in entry:
+                        return entry["package-system-dlls"] == "yes"
+
+            if distribution is None:
+                distribution = getDistributionFromModuleName(module_name)
+
+            module_name = module_name.getPackageName()
+            if not module_name:
+                break
+
+        if distribution is None:
+            return None
+
+        if not isDistributionSystemPackage(getDistributionName(distribution)):
+            return False
+        else:
+            return 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/plugins/standard/EnumPlugin.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
+
+
 """ Standard plug-in to make enum module work when compiled.
 
 The enum module provides a free function __new__ in class dictionaries to
@@ -60,3 +46,19 @@ except AttributeError:
                 """\
 Monkey patching "enum" for compiled '__new__' methods.""",
             )
+
+
+#     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/plugins/standard/EventletPlugin.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Jorj McKie, mailto:<jorj.x.mckie@outlook.de>
-#
-#     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, Jorj McKie, mailto:<jorj.x.mckie@outlook.de> find license text at end of file
+
+
 """ Details see below in class definition.
 """
 
@@ -52,3 +38,19 @@ class NuitkaPluginEventlet(NuitkaPluginBase):
     def decideCompilation(self, module_name):
         if module_name.hasNamespace("dns"):
             return "bytecode"
+
+
+#     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/plugins/standard/GeventPlugin.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Jorj McKie, mailto:<jorj.x.mckie@outlook.de>
-#
-#     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, Jorj McKie, mailto:<jorj.x.mckie@outlook.de> find license text at end of file
+
+
 """ Details see below in class definition.
 """
 
@@ -59,3 +45,19 @@ gevent._config.config.track_greenlet_tree = False
                 """\
 Disabling 'gevent' greenlet tree tracking.""",
             )
+
+
+#     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.