Nuitka-winsvc 1.9.5__tar.gz → 1.9.6__tar.gz

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/Nuitka_winsvc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Nuitka-winsvc
-Version: 1.9.5
+Version: 1.9.6
 Summary: Nuitka but support compile as Windows service
 Home-page: https://github.com/tabris17/Nuitka-winsvc
 Author: tabris17

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/Nuitka_winsvc.egg-info/SOURCES.txt

@@ -1152,6 +1152,8 @@ nuitka/plugins/standard/__init__.py
 nuitka/plugins/standard/standard.nuitka-package.config.yml
 nuitka/plugins/standard/stdlib2.nuitka-package.config.yml
 nuitka/plugins/standard/stdlib3.nuitka-package.config.yml
+nuitka/plugins/standard/DillPlugin/DillPlugin.c
+nuitka/plugins/standard/DillPlugin/dill-postLoad.py
 nuitka/reports/CompilationReportReader.py
 nuitka/reports/LicenseReport.rst.j2
 nuitka/reports/Reports.py

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Nuitka-winsvc
-Version: 1.9.5
+Version: 1.9.6
 Summary: Nuitka but support compile as Windows service
 Home-page: https://github.com/tabris17/Nuitka-winsvc
 Author: tabris17

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/Options.py

@@ -366,7 +366,12 @@ Error, the Python from Windows app store is not supported.""",
     if options.is_onefile:
         options.is_standalone = True
 
-    # Standalone implies no_site build
+    # macOS bundle implies standalone build.
+    if shallCreateAppBundle():
+        options.is_standalone = True
+
+    # Standalone implies no_site build unless overridden, therefore put it
+    # at start of flags, so "site" can override it.
     if options.is_standalone:
         options.python_flags.insert(0, "no_site")
 

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/PythonVersions.py

@@ -331,6 +331,12 @@ def getSystemPrefixPath():
 
             sys_prefix = getDirectoryRealPath(sys_prefix)
 
+        # Self-compiled Python version in source tree
+        if os.path.isdir(
+            os.path.join(os.path.dirname(os.path.realpath(sys.executable)), "PCbuild")
+        ):
+            sys_prefix = os.path.dirname(os.path.realpath(sys.executable))
+
         _the_sys_prefix = sys_prefix
 
     return _the_sys_prefix

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V1.9.5
+Nuitka V1.9.6
 Copyright (C) 2023 Kay Hayen."""
 
 

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/build/Backend.scons

@@ -599,6 +599,8 @@ def _detectPythonHeaderPath():
             os.path.join(
                 python_prefix_external, "include", "python" + python_abi_version
             ),
+            # CPython source code checkout
+            os.path.join(python_prefix_external, "Include"),
             # Haiku specific paths:
             os.path.join(
                 python_prefix_external, "develop/headers", "python" + python_abi_version

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/build/include/nuitka/safe_string_ops.h

@@ -40,9 +40,11 @@ extern void appendWStringSafeW(wchar_t *target, wchar_t const *source, size_t bu
 /* Get OS error code and print it to stderr. */
 #ifdef _WIN32
 typedef DWORD error_code_t;
+#define ERROR_CODE_FORMAT_STR "%ld"
 static inline error_code_t getCurrentErrorCode(void) { return GetLastError(); }
 #else
 typedef int error_code_t;
+#define ERROR_CODE_FORMAT_STR "%d"
 static inline error_code_t getCurrentErrorCode(void) { return errno; }
 #endif
 extern void printOSErrorMessage(char const *message, error_code_t error_code);

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/CompiledFunctionType.c

@@ -909,11 +909,6 @@ void _initCompiledFunctionType(void) {
         }
     }
 #endif
-
-#ifdef _NUITKA_PLUGIN_DILL_ENABLED
-    // TODO: Move this to a __nuitka__ module maybe
-    PyObject_SetAttrString((PyObject *)builtin_module, "compiled_function", (PyObject *)&Nuitka_Function_Type);
-#endif
 }
 
 // Shared implementations for empty functions. When a function body is empty, but

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/CompiledMethodType.c

@@ -559,11 +559,6 @@ PyTypeObject Nuitka_Method_Type = {
 
 void _initCompiledMethodType(void) {
     Nuitka_PyType_Ready(&Nuitka_Method_Type, &PyMethod_Type, false, true, false, false, false);
-
-#ifdef _NUITKA_PLUGIN_DILL_ENABLED
-    // TODO: Move this to a __nuitka__ module maybe
-    PyObject_SetAttrString((PyObject *)builtin_module, "compiled_method", (PyObject *)&Nuitka_Method_Type);
-#endif
 }
 
 PyObject *Nuitka_Method_New(struct Nuitka_FunctionObject *function, PyObject *object, PyObject *klass) {

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersComparisonEq.c

@@ -11770,7 +11770,7 @@ static PyObject *COMPARE_EQ_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11832,7 +11832,7 @@ static bool COMPARE_EQ_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersComparisonGe.c

@@ -11573,7 +11573,7 @@ static PyObject *COMPARE_GE_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11637,7 +11637,7 @@ static bool COMPARE_GE_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersComparisonGt.c

@@ -11557,7 +11557,7 @@ static PyObject *COMPARE_GT_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11621,7 +11621,7 @@ static bool COMPARE_GT_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersComparisonLe.c

@@ -11659,7 +11659,7 @@ static PyObject *COMPARE_LE_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11723,7 +11723,7 @@ static bool COMPARE_LE_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersComparisonLt.c

@@ -11643,7 +11643,7 @@ static PyObject *COMPARE_LT_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11707,7 +11707,7 @@ static bool COMPARE_LT_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersComparisonNe.c

@@ -11681,7 +11681,7 @@ static PyObject *COMPARE_NE_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11742,7 +11742,7 @@ static bool COMPARE_NE_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersFilesystemPaths.c

@@ -749,7 +749,7 @@ bool expandTemplatePathW(wchar_t *target, wchar_t const *source, size_t buffer_s
                     }
                 } else if (wcsicmp(var_name, L"PID") == 0) {
                     char pid_buffer[128];
-                    snprintf(pid_buffer, sizeof(pid_buffer), "%d", GetCurrentProcessId());
+                    snprintf(pid_buffer, sizeof(pid_buffer), "%ld", GetCurrentProcessId());
 
                     appendStringSafeW(target, pid_buffer, buffer_size);
                 } else if (wcsicmp(var_name, L"HOME") == 0) {

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersSafeStrings.c

@@ -133,7 +133,7 @@ void printOSErrorMessage(char const *message, error_code_t error_code) {
     FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
                   error_code, MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), (LPTSTR)&err_buffer, 0, NULL);
 
-    fprintf(stderr, "%s ([Error %d] %s)\n", message, error_code, err_buffer);
+    fprintf(stderr, "%s ([Error " ERROR_CODE_FORMAT_STR "] %s)\n", message, error_code, err_buffer);
 #else
     fprintf(stderr, "%s: %s\n", message, strerror(error_code));
 #endif

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/MetaPathBasedLoader.c

@@ -64,7 +64,7 @@ static inline bool isVerbose(void) { return false; }
 static struct Nuitka_MetaPathBasedLoaderEntry *loader_entries = NULL;
 
 static bool hasFrozenModule(char const *name) {
-    for (struct _frozen const *p = PyImport_FrozenModules;; p++) {
+    for (struct _frozen const *p = PyImport_FrozenModules; p != NULL; p++) {
         if (p->name == NULL) {
             return false;
         }

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/code_generation/templates/CodeTemplatesModules.py

@@ -308,6 +308,13 @@ PyObject *modulecode_%(module_identifier)s(PyThreadState *tstate, PyObject *modu
         init_done = true;
     }
 
+#if defined(_NUITKA_MODULE) && %(is_top)d
+    PyObject *pre_load = IMPORT_EMBEDDED_MODULE(tstate, %(module_name_cstr)s "-preLoad");
+    if (pre_load == NULL) {
+        return NULL;
+    }
+#endif
+
     // PRINT_STRING("in init%(module_identifier)s\n");
 
     moduledict_%(module_identifier)s = MODULE_DICT(module_%(module_identifier)s);
@@ -324,10 +331,6 @@ PyObject *modulecode_%(module_identifier)s(PyThreadState *tstate, PyObject *modu
 
         registerDillPluginTables(tstate, module_name_c, &_method_def_reduce_compiled_function, &_method_def_create_compiled_function);
     }
-
-
-
-
 #endif
 
     // Set "__compiled__" to what version information we have.

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/code_generation/templates_c/HelperLongTools.c.j2

@@ -31,7 +31,7 @@
     }
 
     Py_ssize_t {{operand}}_digit_count = 0;
-    digit {{operand}}_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit {{operand}}_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = {{operand}}_abs_ival;
 

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/nodes/PackageMetadataNodes.py

@@ -85,10 +85,8 @@ class ExpressionPkgResourcesRequireCall(ExpressionPkgResourcesRequireCallBase):
                 resources_module.extern.packaging.requirements.InvalidRequirement
             )
         except AttributeError:
-            # Debian removes "extern.packaging" in some versions
-            import packaging
-
-            InvalidRequirement = packaging.requirements.InvalidRequirement
+            # Very old versions of pkg_resources do not have it
+            InvalidRequirement = TypeError
 
         args = tuple(
             element.getCompileTimeConstant() for element in self.subnode_requirements

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/plugins/PluginBase.py

@@ -1087,8 +1087,11 @@ except ImportError:
         if shallShowExecutedCommands():
             self.info("Executing query command:\n%s" % cmd)
 
+        env = dict(os.environ)
+        env["PYTHONIOENCODING"] = "utf8"
+
         try:
-            feedback = check_output([sys.executable, "-c", cmd])
+            feedback = check_output([sys.executable, "-c", cmd], env=env)
         except NuitkaCalledProcessError as e:
             if e.returncode == 38:
                 return None

Nuitka-winsvc-1.9.6/nuitka/plugins/standard/DillPlugin/DillPlugin.c

@@ -0,0 +1,37 @@
+//     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.
+//
+// C code for use when the dill-plugin is active
+
+#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);
+
+        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);
+}

Nuitka-winsvc-1.9.6/nuitka/plugins/standard/DillPlugin/dill-postLoad.py

@@ -0,0 +1,249 @@
+#     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.
+#
+# Plugin dill-compat has this as post load code for the "dill" package.
+# Not supposed to be good code,
+# pylint: disable=invalid-name,missing-module-docstring,protected-access,too-many-branches,too-many-statements
+from types import CodeType
+
+# spell-checker: ignore kwdefaults,globalvars
+# Nuitka will optimize this away, but VS code will warn about them otherwise.
+from typing import TYPE_CHECKING
+
+import dill._dill
+
+if str is bytes:
+    import __builtin__ as builtins  # Python2 code, pylint: disable=import-error
+else:
+    import builtins
+
+if TYPE_CHECKING:
+    compiled_function_tables = {}
+
+
+class ForCompiledTypeLookups:
+    def for_compiled_type(self):
+        pass
+
+
+compiled_function = type(ForCompiledTypeLookups.for_compiled_type)
+compiled_method = type(ForCompiledTypeLookups().for_compiled_type)
+assert "__compiled__" in globals()
+
+dill_version = tuple(int(d) for d in dill.__version__.split("."))
+
+
+# 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
+        )
+
+
+if str is bytes:
+
+    def _create_compiled_function2(module_name, func_values, func_dict, func_defaults):
+        if module_name not in compiled_function_tables:
+            __import__(module_name)
+
+        # This gets the "_create_compiled_function" of the module and calls it.
+        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
+
+
+if str is not bytes:
+
+    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 as well. This is very closely following
+# the code of "dill._dill.save_function" that is intended to do things for the
+# uncompiled function.
+@dill.register(compiled_function)
+def save_compiled_function(pickler, obj):
+    # Complex beast, pylint: disable=too-many-locals
+
+    if dill_version >= (0, 3):
+        if not dill._dill._locate_function(obj, pickler):
+            if type(obj.__code__) is not CodeType:
+                # Some PyPy builtin functions have no module name, and thus are not
+                # able to be located
+                module_name = getattr(obj, "__module__", None)
+                if module_name is None:
+                    module_name = builtins.__name__
+
+                _module = dill._dill._import_module(module_name, safe=True)
+
+            _recurse = getattr(pickler, "_recurse", None)
+            _postproc = getattr(pickler, "_postproc", None)
+            _main_modified = getattr(pickler, "_main_modified", None)
+            _original_main = getattr(pickler, "_original_main", builtins)
+
+            postproc_list = []
+            if _recurse:
+                # recurse to get all globals referred to by obj
+                from dill.detect import globalvars
+
+                globs_copy = globalvars(obj, recurse=True, builtin=True)
+
+                # Add the name of the module to the globs dictionary to prevent
+                # the duplication of the dictionary. Pickle the unpopulated
+                # globals dictionary and set the remaining items after the function
+                # is created to correctly handle recursion.
+                globs = {"__name__": obj.__module__}
+            else:
+                globs_copy = obj.__globals__
+
+                # If the globals is the __dict__ from the module being saved as a
+                # session, substitute it by the dictionary being actually saved.
+                if _main_modified and globs_copy is _original_main.__dict__:
+                    globs_copy = getattr(pickler, "_main", _original_main).__dict__
+                    globs = globs_copy
+                # If the globals is a module __dict__, do not save it in the pickle.
+                elif (
+                    globs_copy is not None
+                    and obj.__module__ is not None
+                    and getattr(
+                        dill._dill._import_module(obj.__module__, True),
+                        "__dict__",
+                        None,
+                    )
+                    is globs_copy
+                ):
+                    globs = globs_copy
+                else:
+                    globs = {"__name__": obj.__module__}
+
+            if globs_copy is not None and globs is not globs_copy:
+                # In the case that the globals are copied, we need to ensure that
+                # the globals dictionary is updated when all objects in the
+                # dictionary are already created.
+                glob_ids = {id(g) for g in globs_copy.values()}
+                for stack_element in _postproc:
+                    if stack_element in glob_ids:
+                        _postproc[stack_element].append(
+                            (dill._dill._setitems, (globs, globs_copy))
+                        )
+                        break
+                else:
+                    postproc_list.append((dill._dill._setitems, (globs, globs_copy)))
+
+            state_dict = {}
+            for fattrname in ("__doc__", "__kwdefaults__", "__annotations__"):
+                fattr = getattr(obj, fattrname, None)
+                if fattr is not None:
+                    state_dict[fattrname] = fattr
+            if obj.__qualname__ != obj.__name__:
+                state_dict["__qualname__"] = obj.__qualname__
+            if "__name__" not in globs or obj.__module__ != globs["__name__"]:
+                state_dict["__module__"] = obj.__module__
+
+            pickler.save_reduce(
+                _create_compiled_function3,
+                (
+                    obj.__module__,
+                    # This gets the "_reduce_compiled_function" of the module and calls it.
+                    compiled_function_tables[obj.__module__][0](obj),
+                    obj.__dict__,
+                    obj.__defaults__,
+                    obj.__kwdefaults__,
+                ),
+            )
+        else:
+            name = getattr(obj, "__qualname__", getattr(obj, "__name__", None))
+            dill._dill.StockPickler.save_global(pickler, obj, name=name)
+    else:
+        if not dill._dill._locate_function(obj):
+            stack = dill._dill.stack
+
+            _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 _super:
+                pickler._byref = _byref
+            if _memo:
+                pickler._recurse = _recurse
+        else:
+            dill._dill.StockPickler.save_global(pickler, obj)

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/plugins/standard/DillPlugin.py

@@ -19,6 +19,7 @@
 
 """
 
+from nuitka.Options import shallMakeModule
 from nuitka.plugins.PluginBase import NuitkaPluginBase
 
 
@@ -36,7 +37,15 @@ class NuitkaPluginDillWorkarounds(NuitkaPluginBase):
     def createPostModuleLoadCode(self, module):
         full_name = module.getFullName()
 
-        if full_name == "dill":
+        if full_name == "dill" and not shallMakeModule():
+            return (
+                self.getPluginDataFileContents("dill-postLoad.py"),
+                """\
+Extending "dill" for compiled types to be pickle-able as well.""",
+            )
+
+    def createPreModuleLoadCode(self, module):
+        if shallMakeModule() and module.isTopModule():
             return (
                 self.getPluginDataFileContents("dill-postLoad.py"),
                 """\

{Nuitka-winsvc-1.9.5 → Nuitka-winsvc-1.9.6}/nuitka/plugins/standard/standard.nuitka-package.config.yml

@@ -640,6 +640,10 @@
         'comtypes': 'ignore'
 
 - module-name: 'curl_cffi'
+  data-files:
+    patterns:
+      - 'cacert.pem'
+
   implicit-imports:
     - depends:
         - '_cffi_backend'
@@ -5534,6 +5538,13 @@
     - depends:
         - '._*'
 
+- module-name: 'tf_keras.src.utils.vis_utils'
+  anti-bloat:
+    - description: 'remove IPython reference'
+      no-auto-follow:
+        'IPython': 'ignore'
+      when: 'not use_ipython'
+
 - module-name: 'thinc.backends.cblas'
   implicit-imports:
     - depends: