Nuitka-winsvc 2.3__cp311-cp311-win_amd64.whl → 2.3.3__cp311-cp311-win_amd64.whl

nuitka/code_generation/templates/CodeTemplatesModules.py

@@ -619,7 +619,9 @@ static int %(module_dll_entry_point)s_slot(PyObject *module) {
 
 NUITKA_MODULE_INIT_FUNCTION (%(module_dll_entry_point)s)(void) {
     if (_Py_PackageContext != NULL) {
-        module_full_name = _Py_PackageContext;
+        if (strcmp(module_full_name, _Py_PackageContext) != 0) {
+            module_full_name = strdup(_Py_PackageContext);
+        }
     }
 
 #if PYTHON_VERSION < 0x300

nuitka/code_generation/templates_c/CodeTemplateCallsPositional.c.j2

@@ -156,6 +156,56 @@ PyObject *CALL_FUNCTION_WITH_ARGS{{args_count}}(PyThreadState *tstate, PyObject
         }
 #if !defined(_NUITKA_EXPERIMENTAL_DISABLE_CFUNCTION_CALL_OPT)
     } else if (PyCFunction_CheckExact(called)) {
+#if PYTHON_VERSION >= 0x380
+#ifdef _NUITKA_FULL_COMPAT
+        if (unlikely(Py_EnterRecursiveCall((char *)" while calling a Python object"))) {
+            return NULL;
+        }
+#endif
+
+        int flags = PyCFunction_GET_FLAGS(called);
+
+        PyObject *result;
+
+        if (!(flags & METH_VARARGS)) {
+            vectorcallfunc func = *((vectorcallfunc *)(((char *)called) + Py_TYPE(called)->tp_vectorcall_offset));
+
+            assert(func != NULL);
+{% if args_count == 0 %}
+            result = func(called, NULL, 0, NULL);
+{% else %}
+            result = func(called, args, {{args_count}}, NULL);
+{% endif %}
+
+            CHECK_OBJECT_X(result);
+        } else {
+            PyCFunction method = PyCFunction_GET_FUNCTION(called);
+            PyObject *self = PyCFunction_GET_SELF(called);
+
+{% if not has_tuple_arg and args_count != 0 %}
+            PyObject *pos_args = MAKE_TUPLE(tstate, args, {{args_count}});
+{% elif not has_tuple_arg %}
+            PyObject *pos_args = const_tuple_empty;
+{% endif %}
+
+            if (flags & METH_KEYWORDS) {
+                result = (*(PyCFunctionWithKeywords)(void(*)(void))method)(self, pos_args, NULL);
+            } else {
+                result = (*method)(self, pos_args);
+            }
+
+{% if not has_tuple_arg and args_count != 0 %}
+            Py_DECREF(pos_args);
+{% endif %}
+        }
+
+#ifdef _NUITKA_FULL_COMPAT
+        Py_LeaveRecursiveCall();
+#endif
+        CHECK_OBJECT_X(result);
+
+        return Nuitka_CheckFunctionResult(tstate, called, result);
+#else
         // Try to be fast about wrapping the arguments.
         int flags = PyCFunction_GET_FLAGS(called) & ~(METH_CLASS | METH_STATIC | METH_COEXIST);
 
@@ -294,6 +344,7 @@ PyObject *CALL_FUNCTION_WITH_ARGS{{args_count}}(PyThreadState *tstate, PyObject
             return Nuitka_CheckFunctionResult(tstate, called, result);
         }
 #endif
+#endif
 #if PYTHON_VERSION < 0x380 && !defined(_NUITKA_EXPERIMENTAL_DISABLE_UNCOMPILED_FUNCTION_CALL_OPT)
     } else if (PyFunction_Check(called)) {
 #if PYTHON_VERSION < 0x3b0

nuitka/freezer/IncludedEntryPoints.py

@@ -229,6 +229,13 @@ def addIncludedEntryPoint(entry_point):
             if areSamePaths(
                 entry_point.source_path, standalone_entry_point.source_path
             ):
+                if (
+                    standalone_entry_point.kind == "extension"
+                    and entry_point.kind == "dll"
+                ):
+                    entry_point = _makeIgnoredEntryPoint(entry_point)
+                    break
+
                 return
 
             if isShowInclusion():
@@ -325,6 +332,15 @@ def addExtensionModuleEntryPoint(module):
     )
 
 
+def getIncludedExtensionModule(source_path):
+    for standalone_entry_point in standalone_entry_points:
+        if standalone_entry_point.kind == "extension":
+            if areSamePaths(source_path, standalone_entry_point.source_path):
+                return standalone_entry_point
+
+    return None
+
+
 def getStandaloneEntryPoints():
     return tuple(standalone_entry_points)
 

nuitka/freezer/Standalone.py

@@ -49,7 +49,11 @@ from .DllDependenciesMacOS import (
 )
 from .DllDependenciesPosix import detectBinaryPathDLLsPosix
 from .DllDependenciesWin32 import detectBinaryPathDLLsWin32
-from .IncludedEntryPoints import addIncludedEntryPoint, makeDllEntryPoint
+from .IncludedEntryPoints import (
+    addIncludedEntryPoint,
+    getIncludedExtensionModule,
+    makeDllEntryPoint,
+)
 
 
 def checkFreezingModuleSet():
@@ -241,7 +245,7 @@ def _reduceToPythonPath(used_dlls):
 def _detectUsedDLLs(standalone_entry_point, source_dir):
     binary_filename = standalone_entry_point.source_path
     try:
-        used_dlls = _detectBinaryDLLs(
+        used_dll_paths = _detectBinaryDLLs(
             is_main_executable=standalone_entry_point.kind == "executable",
             source_dir=source_dir,
             original_filename=standalone_entry_point.source_path,
@@ -258,7 +262,7 @@ def _detectUsedDLLs(standalone_entry_point, source_dir):
         # Plugins generally decide if they allow dependencies from the outside
         # based on the package name.
 
-        if standalone_entry_point.module_name is not None and used_dlls:
+        if standalone_entry_point.module_name is not None and used_dll_paths:
             module_name, module_filename, _kind, finding = locateModule(
                 standalone_entry_point.module_name, parent_package=None, level=0
             )
@@ -277,35 +281,46 @@ def _detectUsedDLLs(standalone_entry_point, source_dir):
                 )
 
             if allow_outside_dependencies is False:
-                used_dlls = _reduceToPythonPath(used_dlls)
+                used_dll_paths = _reduceToPythonPath(used_dll_paths)
 
         # Allow plugins can prevent inclusion, this may discard things from used_dlls.
         removed_dlls = Plugins.removeDllDependencies(
-            dll_filename=binary_filename, dll_filenames=used_dlls
+            dll_filename=binary_filename, dll_filenames=used_dll_paths
         )
-        used_dlls = tuple(OrderedSet(used_dlls) - OrderedSet(removed_dlls))
-
-        for used_dll in used_dlls:
-            dest_path = os.path.basename(used_dll)
-
-            # TODO: If used by a DLL from the same folder, put it there,
-            # otherwise top level, but for now this is limited to a few cases
-            # where required that way (openvino) or known to be good only (av),
-            # because it broke other things. spell-checker: ignore openvino
-            if standalone_entry_point.package_name in (
-                "openvino",
-                "av",
-            ) and areInSamePaths(standalone_entry_point.source_path, used_dll):
+        used_dll_paths = tuple(OrderedSet(used_dll_paths) - OrderedSet(removed_dlls))
+
+        for used_dll_path in used_dll_paths:
+            extension_standalone_entry_point = getIncludedExtensionModule(used_dll_path)
+            if extension_standalone_entry_point is not None:
+                # Sometimes an extension module is used like a DLL, make sure to
+                # remove it as a DLL then, there is no value in keeping those. Need
+                # to keep it's destination path from that extension module then.
+                dest_path = extension_standalone_entry_point.dest_path
+            elif (
+                standalone_entry_point.package_name is not None
+                and standalone_entry_point.package_name.hasOneOfNamespaces(
+                    "openvino",
+                    "av",
+                )
+                and areInSamePaths(standalone_entry_point.source_path, used_dll_path)
+            ):
+                # TODO: If used by a DLL from the same folder, put it there,
+                # otherwise top level, but for now this is limited to a few cases
+                # where required that way (openvino) or known to be good only (av),
+                # because it broke other things. spell-checker: ignore openvino
+
                 dest_path = os.path.normpath(
                     os.path.join(
                         os.path.dirname(standalone_entry_point.dest_path),
-                        dest_path,
+                        os.path.basename(used_dll_path),
                     )
                 )
+            else:
+                dest_path = os.path.basename(used_dll_path)
 
             dll_entry_point = makeDllEntryPoint(
                 logger=inclusion_logger,
-                source_path=used_dll,
+                source_path=used_dll_path,
                 dest_path=dest_path,
                 module_name=standalone_entry_point.module_name,
                 package_name=standalone_entry_point.package_name,

nuitka/plugins/standard/ImplicitImports.py

@@ -653,6 +653,9 @@ According to Yaml 'overridden-environment-variables' configuration."""
         "asyncua.ua.object_ids",  # Too large generated code
         "asyncua.ua.uaerrors._auto",  # Too large generated code
         "asyncua.server.standard_address_space.standard_address_space_services",  # Too large generated code
+        "opcua.ua.object_ids",  # Too large generated code
+        "opcua.ua.uaerrors._auto",  # Too large generated code
+        "opcua.server.server.standard_address_space",
         "azure.mgmt.network",  # Too large generated code
         "azure.mgmt.compute",  # Too large generated code
         "transformers.utils.dummy_pt_objects",  # Not performance relevant.

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

@@ -446,10 +446,12 @@
         'is_triton_available()': 'False'
       when: 'not use_setuptools'
 
-- module-name: 'bokeh' # checksum: e1035750
+- module-name: 'bokeh' # checksum: cd9c2e63
   data-files:
     dirs:
       - '_sri'
+    patterns:
+      - '_sri.json'
 
 - module-name: 'bokeh.core' # checksum: 3dbea61d
   data-files:
@@ -1822,6 +1824,13 @@
       replacements_plain:
         'from keras.testing_infra.test_utils import layer_test': ''
 
+- module-name: 'keras.src' # checksum: 9760fd72
+  anti-bloat:
+    - description: 'remove unittest reference'
+      replacements_plain:
+        'from keras.src.testing_infra import test_utils': 'test_utils = None'
+      when: 'not use_unittest'
+
 - module-name: 'keras.src.utils.vis_utils' # checksum: 7d07a2d1
   anti-bloat:
     - description: 'remove IPython reference'
@@ -3388,7 +3397,7 @@
         'display': 'un-callable'
       when: 'not use_ipython'
 
-- module-name: 'pkg_resources' # checksum: 9cc15580
+- module-name: 'pkg_resources' # checksum: d0674fc2
   anti-bloat:
     - description: 'avoid using plistlib dependency on non-macOS'
       replacements_plain:
@@ -3398,6 +3407,12 @@
       replacements_plain:
         'def load(self, require=True,': 'def load(self, require=False,'
         'if not require or args or kwargs:': 'if False:'
+    - description: 'disable deprecation warnings'
+      replacements_plain:
+        'warnings.warn(': 'if False: warnings.warn('
+  implicit-imports:
+    - depends:
+        - 'pkg_resources.extern'
 
 - module-name: 'pkg_resources._vendor.appdirs' # checksum: 9d4faeee
   anti-bloat:

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

@@ -9,6 +9,11 @@
     - depends:
         - 'asyncio'
 
+- module-name: '_osx_support' # checksum: e893ad4b
+  anti-bloat:
+    - no-auto-follow:
+        'distutils': 'ignore'
+
 - module-name: '_zoneinfo' # checksum: 8de2a2bd
   implicit-imports:
     - depends:

nuitka/tools/testing/run_nuitka_tests/__main__.py

@@ -241,6 +241,16 @@ The standard CPython3.11 test suite. Execute this for all corner cases to be
 covered. With Python 2.x these are not run. Default is %default.""",
     )
 
+    parser.add_option(
+        "--skip-cpython312-tests",
+        action="store_false",
+        dest="cpython312",
+        default=True,
+        help="""\
+The standard CPython3.12 test suite. Execute this for all corner cases to be
+covered. With Python 2.x these are not run. Default is %default.""",
+    )
+
     parser.add_option(
         "--skip-other-cpython-tests",
         action="store_true",
@@ -370,6 +380,15 @@ Do not use Python3.10 even if available on the system. Default is %default.""",
 Do not use Python3.11 even if available on the system. Default is %default.""",
     )
 
+    parser.add_option(
+        "--no-python3.12",
+        action="store_true",
+        dest="no312",
+        default=False,
+        help="""\
+Do not use Python3.12 even if available on the system. Default is %default.""",
+    )
+
     parser.add_option(
         "--coverage",
         action="store_true",
@@ -436,6 +455,8 @@ Enforce the use of MinGW64 on Windows. Defaults to off.""",
             options.no310 = True
         if sys.version_info[0:2] != (3, 11):
             options.no311 = True
+        if sys.version_info[0:2] != (3, 12):
+            options.no312 = True
 
     if options.cpython_no_other:
         if sys.version_info[0:2] != (2, 6):
@@ -460,6 +481,8 @@ Enforce the use of MinGW64 on Windows. Defaults to off.""",
             options.cpython310 = False
         if sys.version_info[0:2] != (3, 11):
             options.cpython311 = False
+        if sys.version_info[0:2] != (3, 12):
+            options.cpython312 = False
 
     if options.cpython_none:
         options.cpython26 = False
@@ -473,6 +496,7 @@ Enforce the use of MinGW64 on Windows. Defaults to off.""",
         options.cpython39 = False
         options.cpython310 = False
         options.cpython311 = False
+        options.cpython312 = False
 
     if options.coverage and os.path.exists(".coverage"):
         os.unlink(".coverage")
@@ -580,6 +604,8 @@ def main():
             return False
         if command == "python3.11" and options.no311:
             return False
+        if command == "python3.12" and options.no312:
+            return False
 
         # Shortcuts for python versions, also needed for Windows as it won't have
         # the version number in the Python binaries at all.
@@ -911,6 +937,17 @@ def main():
                     else:
                         my_print("The CPython3.11 tests are not present, not run.")
 
+            # Running the Python 3.12 test suite only with CPython3.x.
+            if not use_python.startswith("python2"):
+                if options.cpython312:
+                    if os.path.exists("./tests/CPython312/run_all.py"):
+                        with withExtendedExtraOptions(
+                            *getExtraFlags(where, "312tests", flags)
+                        ):
+                            executeSubTest("./tests/CPython312/run_all.py search")
+                    else:
+                        my_print("The CPython3.12 tests are not present, not run.")
+
     if not any(
         checkExecutableCommand("python%s" % python_version)
         for python_version in getTestExecutionPythonVersions()

nuitka/tree/ReformulationMatchStatements.py

@@ -161,17 +161,18 @@ def _buildMatchSequence(provider, pattern, make_against, source_ref):
     # Could special case ">=1" or "==0" with truth checks potentially, but that
     # is for generic optimization to recognize, we don't know much about the
     # matched value at this point yet.
-    conditions.append(
-        makeComparisonExpression(
-            left=ExpressionBuiltinLen(
-                value=make_against(),
+    if min_length > 0 or exact:
+        conditions.append(
+            makeComparisonExpression(
+                left=ExpressionBuiltinLen(
+                    value=make_against(),
+                    source_ref=source_ref,
+                ),
+                right=makeConstantRefNode(constant=min_length, source_ref=source_ref),
+                comparator="Eq" if exact else "GtE",
                 source_ref=source_ref,
-            ),
-            right=makeConstantRefNode(constant=min_length, source_ref=source_ref),
-            comparator="Eq" if exact else "GtE",
-            source_ref=source_ref,
+            )
         )
-    )
 
     star_pos = None
 
@@ -195,8 +196,8 @@ def _buildMatchSequence(provider, pattern, make_against, source_ref):
                 assert "!" not in variable_name, variable_name
 
                 # Last one
-                if star_pos == len(pattern.patterns):
-                    slice_value = slice(count)
+                if star_pos == len(pattern.patterns) - 1:
+                    slice_value = slice(star_pos, None)
                 else:
                     slice_value = slice(count, -(len(pattern.patterns) - (count + 1)))
 

nuitka/tree/SourceHandling.py

@@ -266,6 +266,10 @@ def checkPythonVersionFromCode(source_code):
             result = 0x3B0 > python_version >= 0x3A0
         elif basename == "python3.11":
             result = 0x3C0 > python_version >= 0x3B0
+        elif basename == "python3.12":
+            result = 0x3D0 > python_version >= 0x3C0
+        elif basename == "python3.13":
+            result = 0x3E0 > python_version >= 0x3D0
         else:
             result = None
 

nuitka/utils/FileOperations.py

@@ -731,7 +731,7 @@ def removeDirectory(path, ignore_errors):
 
     def onError(func, path, exc_info):
         # Record what happened what happened, pylint: disable=unused-argument
-        last_error.append(func, path)
+        last_error.append((func, path))
 
     with withFileLock("removing directory %s" % path):
         if os.path.exists(path):

nuitka/utils/ReExecute.py

@@ -12,6 +12,8 @@ spell-checker: ignore execl, Popen
 import os
 import sys
 
+from nuitka.Options import shallExecuteImmediately
+
 
 def callExecProcess(args, uac):
     """Do exec in a portable way preserving exit code.
@@ -83,6 +85,9 @@ def reExecuteNuitka(pgo_filename):
     else:
         os.environ["NUITKA_SYS_PREFIX"] = sys.prefix
 
+    if shallExecuteImmediately():
+        args.append("--run")
+
     # Same arguments as before.
     args += sys.argv[1:]
 

nuitka/utils/SharedLibraries.py

@@ -661,7 +661,15 @@ def copyDllFile(source_path, dist_dir, dest_path, executable):
         # Path must be normalized for this to be correct, but entry points enforced that.
         count = dest_path.count(os.path.sep)
 
-        rpath = os.path.join("$ORIGIN", *([".."] * count))
+        # TODO: This ought to depend on actual presence of used DLLs with middle
+        # paths and not just do it, but maybe there is not much harm in it.
+        if count > 0:
+            rpath = ":".join(
+                os.path.join("$ORIGIN", *([".."] * c)) for c in range(count, 0, -1)
+            )
+        else:
+            rpath = "$ORIGIN"
+
         setSharedLibraryRPATH(target_filename, rpath)
 
     if isWin32Windows() and isUnstripped():